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). After resolving conflict you must do 'git add' for file, and than commit it. Or if you want to undo merge - just do 'git reset --hard' to roll-back to last commit in local branch.
------------------------------------------------------------------------------ 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
