git - Not Possible to switch branch after --skip-worktree -


what want do

i have file contains sensitive datas don't want push content of file remote server.

what did?

to achieve this, made commit when file empty , pushed empty file server (github). , fill file sensitive datas , applied git update-index --skip-worktree path/to/file . didn't made commit.

now i'm trying switch branch i'm getting error :

    error: local changes following files overwritten checkout:     path/to/file     please, commit changes or stash them before can switch branches.     aborting

why use skip-worktree instead of assume-unchanged?

i read few questions subject, , found borealid's answer.

--assume-unchanged assumes developer shouldn’t change file. flag meant improving performance not-changing folders sdks.

--skip-worktree useful when instruct git not touch specific file ever because developers should change it. example, if main repository upstream hosts production-ready configuration files , don’t want accidentally commit changes files, --skip-worktree want.

after this, found jeff's question , vonc's answer. jeff's problem same mine, , followed vonc's solution. it's not work me. maybe because of git version difference. because question 2012. talked vonc , said ask new question because couldn't remember answer.

i tried use --assume-unchanged , --skip-worktree together, , soft reseting worktree. nothing changed.

so?

can me problem ?

thank you.

i haven't been able find neat solution this, i'm using .bat file run --no-skip-worktree on affected files. stash, switch branch, stash apply, , use .bat file run --skip-worktree on same files.

it's not nice, it's simplest , quickest way i've found far.


-

Popular posts from this blog

html/hta mutiple file in audio player -

ok started coding .hta application , pretty html page .hta extension , adde mp3 player , did work <object data="test.mp3" type="audio/mp3" width="200" height="40"> <param name="src" value="test.mp3"> <param name="autostart" value="0"> </object> but it's 1 song playing again , again , plz there way add multiple files playlist believe it's should added "src" parameters not sure, i'm starting did add "," in between , , tried ";" none of them working i'm waiting answers :d i wanna know if can show me how become familiar tag see it's helpful , powerful activex, audio,video,pdf .... files i'm waiting impatiently [i don't know object, plz plz more clear] get inspired example hta_audio_player.hta <html> <head> <title>hackoo audio player playlist hackoo 2014</title> <hta:app...
Read more

debugging - Reference - What does this error mean in PHP? -

what this? this number of answers warnings, errors , notices might encounter while programming php , have no clue how fix. community wiki, invited participate in adding , maintaining list. why this? questions "headers sent" or "calling member of non-object" pop on stack overflow. root cause of questions same. answers questions typically repeat them , show op line change in his/her particular case. these answers not add value site because apply op's particular code. other users having same error can not read solution out of because localized. sad, because once understood root cause, fixing error trivial. hence, list tries explain solution in general way apply. what should here? if question has been marked duplicate of this, please find error message below , apply fix code. answers contain further links investigate in case shouldn't clear general answer alone. if want contribute, please add "favorite" error message, warning or notic...
Read more