Re: [Flightgear-devel] Git merge oops.
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 separate issue that the build will be broken following my earlier > merge - I was trying to fix the build when I did the bad push. All fixed now, including the build issues. Apologies again, and thanks to Tim for the speedy fix. James -- This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
[Flightgear-devel] Git merge oops.
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 earlier merge - I was trying to fix the build when I did the bad push. (If you're looking at the Gitorious web interface, it's the push of 133 commits that is the issue) Apologies for the SNAFU, James -- This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
