Git fetch and merge error but file not modified -

-

after fetching remote (git fetch origin), have following commmit tree, , working on "personal_commit"

---develop----origin/develop        \----personal_commit.

i checked out develop, , try perform merge fast-forwards origin/develop. way, can later rebase personal_commit on develop. error: "your local changes following file overriden merge" "please, commit changes or stash them before can merge".

but there no pending changes on file ! please me resolve this.

notes:

  • although file automatically generated, , can discard safely, possible in 1 of branches, had removed git repository in past.

  • this answer not work because there no changes stash or commit.

git problem

you have untracked file alldiagnostics.cs on local machine, being fetched in upstream code well. since git diff shows diff tracked files only, hence not appearing in output.

also, seem have ignore rule file in .gitignore, because of doesn't appear in output of git status either.

my suggestion rename else (mv alldiagnostics.cs alldiagnostics.cs.bkp), git merge, , apply changes alldiagnostics.cs.bkp freshly fetched file.

if file not supposed committed, can untrack later using

git rm alldiagnostics.cs git commit -m "removed alldiagnostics.cs"

Comments

Post a Comment

Popular posts from this blog

javascript - how to protect a flash video from refresh？ -

-
<!doctype html> <html> <head> <meta http-equiv="content-type" content="text/html; charset=utf-8"> <title>flash video refresh</title> </head> <body> <div id="playerzone"><embed height="496" width="580" flashvars="flvid=19742822&amp;createtime=2012-4-19 13:46:33" wmode="opaque" allowscriptaccess="always" allowfullscreen="true" quality="high" bgcolor="#000000" name="player" id="player" src="swf/mine.swf" type="application/x-shockwave-flash"></div> <a onclick="return test();" id="test">click me popup div,and hide scrollbar</a> </body> the code upon： for example,when click a#test button,popup div,it's no problem,but want hide scrollbar while div popup. i used $('html').css('overflow','hidden') in
Read more

android - Associate same looper with different threads -

-
Image
in application, want create multiple threads working on single queue. create queue know need call looper.prepare() . i want other threads create should associated looper created first thread, how can achieve this? use 1 of java thread safe queue class java.util.concurrent package instead of looper achieve goal. it's more common practice. share queue between threads , post task queue entry 1 thread can entry thread. blockingqueue can - in 1 thread call take() , block thread until thread put() entry queue. that's all. producer consumer pattern example blockingqueue or concurrentlinkedqueue about blockingqueue
Read more

visual studio 2010 - Connect to informix database windows form application -

-
i trying figure out how connect ibm informix database. have been doing research , have found threads 5 years ago examples not working. i have installed latest sdk ibm informix. i have included ibm.data.informix.dll references in project. i have included using ibm.data.informix; i adding button , on click testing conenction. debug error "sql0035n file "c:\users\adam\documents\visual studio 2010\projects\test\test\msg\en_us\db2nmp.xml" cannot opened." this file not exist , dont see anywhere in program files (x86)\ibm informix client sdk directory. my on click code is private void button1_click(object sender, eventargs e) { const string host = "192.168.obfuscated"; const string servicenum = "1525"; //port? const string server = "serverobfuscated"; const string database = "dbobfuscatedy"; const string user = "myusername"; const string password = &
Read more