How to get git to completely ignore a file? -


i'm working on collaborative project remote repo. 1 of source files in repo "configuration"-type file, , i'd maintain own local copy of file different 1 in remote, without git looking @ file. is, don't want git track file; don't want committed if use git commit -a; , don't want pushed when used git push remote. don't want delete remote repo, git rm --cached wrong.

a couple places (including 1 on stackoverflow) suggested using git update-index --assume-unchanged <config-file>. seemed work; if use git status, file isn't listed modified, , git commit -a doesn't try commit it. however, git still preventing me switching branches locally, between "master" , working branch. if try git checkout master go working branch master, or vice versa, get

error: local changes following files overwritten checkout:      <config-file>  please, commit changes or stash them before can switch branches.

git checkout -f doesn't help:

error: entry '<config-file>' not uptodate. cannot merge.

it seems switch branches, have rename file, use git checkout, rename back, every time switch. not going acceptable. neither using command git stash every time want switch branches, need lot.

the file listed in .gitignore.

how can git ignore file?

i'd problem not in tool, in process. i've had deal before when deploying apps , think solution this:

  • move config file config.sample instead

  • make sure deployment/installation copies config.sample config if doesn't exist

  • don't add config git @ - doesn't need tracked

  • keep config in .gitignore, it's not committed accident in future


Comments

Post a Comment

Popular posts from this blog

Email notification in google apps script -

https://support.google.com/docs/answer/91588?hl=en i have sheet the cells filled in data pulled via apps script, website. pull in exact same data, not. on old sheets version use able emails when data "changes" different value. new sheets, email when new data pasted cells, though exact same data......and, can't set @ ranges anymore, entire document. there easy way watch cells when data changes, , email myself? this looks lot you're trying do. for checking whether value has changed after edit, this gives necessary information it. hence, know whether new value same 1 or not. implementing "workaround" talked in second link, able compare , send email myself if value changed. initiate onedit trigger goes off onedit function uses these lines after checks in place have passed. var email = "xyz@whatever.com"; mailapp.sendemail(email, "triggermail", "a change has occurred in sheet"); note: sends "notification...
Read more

c++ - Difference between pre and post decrement in recursive function argument -

i have following sample code used pre-decrement void function(int c) { if(c == 0) { return; } else { cout << "dp" << c << endl; function(--c); cout << c << endl; return; } } this function give output input 4 : dp3 dp2 dp1 dp0 0 1 2 3 but when use post decrement void function(int c) { if(c == 0) { return; } else { cout << "dp" << c << endl; function(c--); cout << c << endl; return; } } output goes in infinite loop dp4 can explain me in detail why happens ? this happens because function(c--) called same value of c , when finishes c decremented. recursively called, hence called same value no chance of return , hit stack overflow error. assume this, int x = 1, y = 0; y = x++ result y == 1 , x == 2. if y = ++x , bot x , y 2.
Read more

javascript - IE11 incompatibility with jQuery's 'readonly'? -

the code i'm running has no issues in firefox, or chrome. user typing 1 textbox, tabs next , can continue typing that. when run webpage on ie11, user tabs next textbox , can't type in. textbox has double-clicked before user can insert anything. i've googled , seems ie give problems when using older jquery (i.e. prefers 'prop' 'attr' ). in code below jquery's readonly keyword being used in way ie11 no longer recognise/accept? i assume issue readonly , removeclass('ignore') working expected. //when focus on textbox 1 $("#field1").focus(function() { //remove readonly property textbox 1 $('#field1').prop('readonly', false).removeclass('ignore'); //add readonly property other textboxes $('#field2, #field3, #field4') .prop('readonly', 'readonly').addclass('ignore').val(''); }); i'm using jquery 2.1.3 ...
Read more