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
smime.p7s
Description: S/MIME Kryptografische Unterschrift
------------------------------------------------------------------------------ All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2dcopy2
_______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
