git - How To Switch Branches With Changes Made In A Folder That Was Added To .gitignore? -


i created branch temp.
installed newer version of express module. added node_modules folder .gitignore.

[ubuntu@ip-172-31-10-215:~/bitstarter]$git checkout master error: following untracked working tree files overwritten checkout:         node_modules/.bin/express         node_modules/express/.npmignore         node_modules/express/history.md         node_modules/express/license         node_modules/express/makefile         node_modules/express/readme.md         node_modules/express/bin/express         node_modules/express/index.js         node_modules/express/lib/express.js         node_modules/express/lib/request.js         node_modules/express/lib/response.js         node_modules/express/lib/router/index.js         node_modules/express/lib/router/route.js         node_modules/express/lib/utils.js         node_modules/express/lib/view.js         node_modules/express/node_modules/connect/.npmignore         node_modules/express/node_modules/connect/license         node_modules/express/node_modules/connect/index.js         node_modules/express/node_modules/connect/lib/cache.js         node_modules/express/node_modules/connect/lib/connect.js         node_modules/express/node_modules/connect/lib/index.js         node_modules/express/node_modules/connect/lib/middleware/basicauth.js         node_modules/express/node_modules/connect/lib/middleware/bodyparser.js         node_modules/express/node_modules/connect/lib/middleware/compress.js         node_modules/express/node_modules/connect/lib/middleware/cookieparser.js         node_modules/express/node_modules/connect/lib/middleware/csrf.js         node_modules/express/node_modules/connect/lib/middleware/directory.js         node_modules/express/node_modules/connect/lib/middleware/errorhandler.js         node_modules/express/node_modules/connect/lib/middleware/favicon.js         node_modules/express/node_modules/connect/lib/middleware/limit.js         node_modules/express/node_modules/connect/lib/middleware/logger.js         node_modules/express/node_modules/connect/lib/middleware/methodoverride.js         node_modules/express/node_modules/connect/lib/middleware/query.js         node_modules/express/node_modules/connect/lib/middleware/responsetime.js         node_modules/express/node_modules/connect/lib/middleware/session.js         node_modules/express/node_modules/connect/lib/middleware/session/cookie.js         node_modules/express/node_modules/connect/lib/middleware/session/memory.js         node_modules/express/node_modules/connect/lib/middleware/session/session.js         node_modules/express/node_modules/connect/lib/middleware/session/store.js         node_modules/express/node_modules/connect/lib/middleware/static.js         node_modules/express/node_modules/connect/lib/middleware/staticcache.js         node_modules/express/node_modules/connect/lib/middleware/vhost.js         node_modules/express/node_modules/connect/lib/patch.js         node_modules/express/node_modules/connect/lib/public/directory.html         node_modules/express/node_modules/connect/lib/public/error.html         node_modules/express/node_modules/connect/lib/public/favicon.ico         node_modules/express/node_modules/connect/lib/public/icons/page.png         node_modules/express/node_modules/connect/lib/public/icons/page_add.png         node_modules/express/node_modules/connect/lib/public/icons/page_attach.png         node_modules/express/node_modules/connect/lib/public/icons/page_code.png         node_modules/express/node_modules/connect/lib/public/icons/page_copy.png         node_modules/express/node_modules/connect/lib/public/icons/page_delete.png         node_modules/express/node_modules/connect/lib/public/icons/page_edit.png         node_modules/express/node_modules/connect/lib/public/icons/page_error.png         node_modules/express/node_modules/connect/lib/public/icons/page_excel.png         node_modules/express/node_modules/connect/lib/public/icons/page_find.png         node_modules/express/node_modules/connect/lib/public/icons/page_gear.png         node_modules/express/node_modules/connect/lib/public/icons/page_go.png         node_modules/express/node_modules/connect/lib/public/icons/page_green.png         node_modules/express/node_modules/connect/lib/public/icons/page_key.png         node_modules/express/node_modules/connect/lib/public/icons/page_lightning.png         node_modules/express/node_modules/connect/lib/public/icons/page_link.png         node_modules/express/node_modules/connect/lib/public/icons/page_paintbrush.png         node_modules/express/node_modules/connect/lib/public/icons/page_paste.png         node_modules/express/node_modules/connect/lib/public/icons/page_red.png         nod aborting

here git status (for fun):

[ubuntu@ip-172-31-10-215:~/bitstarter]$git status # on branch temp nothing commit (working directory clean)

it 1:30 @ night here i'm dead tired , cannot life of me find clean solution (scared losing work or messing dependencies or something).
check answers tomorrow thank much!

looks you've committed files before added rule .gitignore.

you can remove them git git rm --cached <file>.

in order switch branches dirty directory, fastest , easiest stash changes.


Comments

Post a Comment

Popular posts from this blog

assembly - 8086 TASM: Illegal Indexing Mode -

this question has answer here: illegal use of register in indirect addressing 1 answer i writing 8086 assembly program needs compile through tasm v3.1. running error can not seem fix. my data segment has following set purposes of keyboard input: parao label byte maxo db 5 acto db ? datao db 5 dup('$') what trying first character entered, first byte of datao: lea dx, datao mov bl, [dx] however, when attempt compile, error: **error** h5.asm(152) illegal indexing mode line 152 "mov bl, [dx]" any appreciated. if matters, running tasm through dosbox (my laptop running 64-bit win7) google hasn't come helpful answers. can post entirety of code if necessary. pretty sure reason can't use dx register pointer. try instead using [si], [di] or [bx]: lea bx, data0 mov al, [bx]
Read more

Java, LWJGL, OpenGL 1.1, decoding BufferedImage to Bytebuffer and binding to OpenGL across classes -

i've been attempting solve problem without luck. have 4 classes, main class, object class, sprite class , image loader class. i'm attempting load png using image loader , using method found here: http://www.java-gaming.org/topics/bufferedimage-to-lwjgl-texture/25516/msg/220280/view.html#msg220280 convert bytebuffer, , bind opengl. the image in it's own seperate resource folder. should being drawn this: ( http://i.imgur.com/j8gbu4c.png ) (32x32), i'm seeing white box has dimensions of image, not actual texture. if has idea of go fix i'd appreciate it. i'm new opengl , looking avoid using external library in order learn how actual code works. thanks. updated! to following, implemented suggestion provided vallentin, quad taking color of first pixel in image. i've attempted implementing image loader provided c.s here . i'm receiving error: javax.imageio.iioexception: error reading png image data @ com.sun.imageio.plugins.png.pngimagereader.r...
Read more

javascript - addthis share facebook and google+ url -

i attempting use addthis create simple url shares whichever current page user on when click share button. of right now, have twitter working. when user clicks, able see url populated in tweet box. when user clicks facebook or google+, url doesn't seem show in share box. <ul class="addthis_toolbox addthis_default_style "> <li><a class="addthis_button_facebook"><img src="/img/facebook-social.png" width="20" height="20" border="0" alt="share" /></a></li> <li><a class="addthis_button_twitter"><img src="/img/twitter-social.png" width="20" height="20" border="0" alt="share" /></a></li> <li><a class="addthis_button_google_plusone_share"><img src="/img/google-social.png" width="20" height="20" border="0" alt="s...
Read more