Am Montag, 26. September 2011, 19:14:43 schrieb KP Kirchdoerfer: > Am Montag, 26. September 2011, 13:23:26 schrieb Erich Titl: > > 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. > > > > > 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. > > > > 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. > > > > Git is just like Pandoras Box, you never know what you get, but it is > > always a surprise. > > > > cheers > > > > Erich > > Hi Erich; > > I'm just rebuilding from scratch if anything is broken, we'll see > later...
ok, webconf looks still fine :) and a short look into dhcpd seems to be as well - so I assume you didn't broke anything while dealing with git. I suggest that we freeze 4.1 for the rc1 and I'll try to accomplish that task over the weekend. David, there is one task open - license.lrp should be added to the images (leaf.cfg). I know we are not finished adding a license tag to all packages but for it will be a start. About packages with different source packages and (eventually) various licenses (e.g. initrd) I suggest to support something like License = GPL-2, ISC Maybe that's enough - given that a very few will even follow the links and read the license :) Opinions? kp ------------------------------------------------------------------------------ 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
