git , how to accept rm file update without delete the file? -


i have local_settings.py in django prject, custom settings different each dev. yesterday, mistake commit conf/local_settings.py repo , push bitbucket. project new, think can not rollback because file committed @ first push,
remove local_settings.py repo without delete git rm --cached ./conf/local_settings.py.that works on local machine.

i meet error when git pull on vps.

..... >>> git pull origin master updating f1d56d3..6163ffb error: local changes following files overwritten merge:         conf/local_settings.py please, commit changes or stash them before can merge. aborting

how can make others not delete local_settings.py after pulling repo , update code automatically? new git , afraid go wrong if others merge themself in case.

my case example:

a has local_settings.py , b has local_settings.py, use origin master.

  1. a git init , push files. b pull. a, b change local_settings.py , different.
  2. a find local_settings.py should not in repo.
  3. a git rm --cached ./conf/local_settings.py, , push commit.
  4. (what need) b pull, remove local_settings.py b local repo without delete it.

other developers won't able pull version contains local_settings.py because git knows overwrite (untracked) version. after remove , push removal, other developers able pull again.


Comments

Post a Comment

Popular posts from this blog

javascript - Google App Script ContentService downloadAsFile not working -

i have web app developed using google app script htmlservice , html form, populating excel sheet in google drive using spreadsheetapp . , 1 section calling contentservice download data excel file. function doget(e) { // read excel sheet //getappfile(); // render application html template return htmlservice.createtemplatefromfile('index').evaluate() .settitle('go smart') .setsandboxmode(htmlservice.sandboxmode.iframe); } function downloaddoublequatecsvfile() { var sheetid = propertiesservice.getscriptproperties().getproperty('sheetid'); var ss = spreadsheetapp.openbyid(sheetid).getactivesheet(); //var ss = spreadsheetapp.getactivespreadsheet().getactivesheet(); var maxcolumn = ss.getlastcolumn(); var maxrow = ss.getlastrow(); var data = ss.getrange(1, 1, maxrow, maxcolumn).getvalues(); if (data.length > 1) { var csv = ""; (var row = 0; row < data.length; row++) { (var c...
Read more

javascript - Function overwritting -

is there way overwrite function or event handling in function? using addeventlistener, can have many event handlers on element want var test=document.getelementbyid("div"); test.addeventlistener("click",function(){alert("im first");},false); test.addeventlistener("click",function(){alert("im second");},false); // alerts "im first" , after "im second" but if want overwrite function/event example based on client width example this function one() { alert("first"); } function two() { alert("second"); } window.onresize = function() { var test = document.getelementbyid("div"); if (window.innerwidth > 500) { test.onclick = 1 } else { test.onclick = two; } } is possible in javascript? in case use effective little known approach. addeventlistener can accept object property handleevent event handler. in case it's easy overwr...
Read more

c# - Exception when attempting to modify Dictionary -

i creating dictionary manage threads , ran exception when attempt clear dead threads after adding threads dictionary. using system; using system.collections.generic; using system.threading; namespace syscat { public class threadmanager { public static readonly threadmanager globalthreadmanager = new threadmanager( ); /// <summary> /// initializes new instance of <see cref="syscat.threadmanager"/> class. /// </summary> public threadmanager( ) { } /// <summary> /// create new threadmanager threads within basetm , deinitializes basetm /// </summary> public threadmanager( threadmanager basetm ) { this.threads = basetm.threads; basetm.threads.clear( ); } private dictionary<guid,thread> threads = new dictionary<guid, thread>( ); /// <summary> /// attempts obtain unused threadid within ...
Read more