On 26/09/11 14:23, Erich Titl wrote: > Hi Andrew > > at 26.09.2011 11:43, Andrew wrote: >> On 26/09/11 00:53, Erich Titl wrote: >>> HI Folks >>> >>> This thing is driving me crazy >>> >>> mega@luna:~/leaf/devel/leaf/repo/dhcpd> git pull >>> You are in the middle of a conflicted merge. >>> >>> So what? There seems to be no way to find out about the conflicts as >>> pull is quite crytic about it. Even if I just abandon any work on dhcp I >>> am stuck and I am not prepared to throw away everything again. There >>> must be a solution to all this. >>> >>> cheers >>> >>> Erich >>> >>> >> Do 'git status' to see conflicts and modified files. Conflicting files >> will have both old and new code into body separated by header/tailer >> (you can make search by '>>>' in file). > I finally found that, but it definitely is not what one would expect. > There must be a way to tell it "I don't really care, just do it". Git > tries IMHO to be too fancy. > In what way git should decide which commit (from local branch or from remote branch) that touches same line of code in file should be choosed in merge? :) >> After resolving conflict you must do 'git add' for file, and than commit it. >> Or if you want to undo merge > Well, if you ere in the middle of an unsuccessful merge this makes you > wonder. I played with git in other project (my own branch of embedded firmware with some customizations), and unsuccessful automerge was usual condition almost on every sync. Just resolve conflicts manual and add conflicting files - and then merge can be committed. > Anyway it took me a few hours to just straighten out my own repo, I > don't know about the fatalities I introduced in the MAIN branch by just > plowing my way out of that thicket. Sorry about that. > Just look on 'git log -p <commit1> <commit2>' to saw all changes. > Git is just like Pandoras Box, you never know what you get, but it is > always a surprise. > > cheers > > Erich
------------------------------------------------------------------------------ All the data continuously generated in your IT infrastructure contains a definitive record of customers, application performance, security threats, fraudulent activity and more. Splunk takes this data and makes sense of it. Business sense. IT sense. Common sense. http://p.sf.net/sfu/splunk-d2dcopy1 _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
