Author: Nigel Cunningham Date: To: Kenneth Crudup CC: tuxonice-devel Subject: Re: [TuxOnIce-devel] So the ToI GIT isn't guaranteed to build, then?
Hi.
On Thu, 2008-07-17 at 15:45 -0700, Kenneth Crudup wrote: > On Fri, 18 Jul 2008, Nigel Cunningham wrote:
>
> > To avoid 'polluting' your copy of the upstream tree, I'd do:
>
> I'm *really* going to have to find a GIT primer somewhere! But, as you said:
>
> > I'm not sure how long I'll be - I have other work to do that's higher priority.
>
> Yeah, M3 T00!! (Besides, I'm quite happy with the build as of yesterday
> about noon USA PDT- everything works well- I just wish I'd snapshotted it!)
Run gitk to see the history. That tells me that the last merge which
should work fine is 4e6d158c7ae90a6e01538704565469a8a2e96aed. So if you
do
git branch good 4e6d158c7ae90a6e01538704565469a8a2e96aed
git checkout good
You should be on the commit prior to yesterday's merge of Rafael's
conflicting work.
(text/plain)