Re: [Flightgear-devel] Git merge oops.

2010-06-26 Thread James Turner
On 26 Jun 2010, at 17:41, James Turner wrote: > I pushed a wrong branch by accident, which will mess up history in the repo. > Not the end of the world, but Tim can fix it if people avoid committing to fg > (simgear and fgdata are unaffected) until he's rolled back my mistake. > There's a sepa

[Flightgear-devel] Git merge oops.

2010-06-26 Thread James Turner
I pushed a wrong branch by accident, which will mess up history in the repo. Not the end of the world, but Tim can fix it if people avoid committing to fg (simgear and fgdata are unaffected) until he's rolled back my mistake. There's a separate issue that the build will be broken following my ea