On Sat, Sep 17, 2011 at 11:48:13PM +0100, Ian Lynagh wrote: > On Sat, Sep 17, 2011 at 03:28:04PM -0700, Ian Lynagh wrote: > > > > commit 44dd630632f47bec3693ea9a22a896edfad15fd7 > > I didn't intend to push these. I think I have a detached HEAD. > > So the central repo is now at 44dd63, and my local repo is at 9d7337. > What's the right way to end up with the master repo being such that all > the files have the same contents as they do in 9d7337?
Solution, with thanks to nominolo et al in #ghc: git branch tmp git merge -s ours master git checkout master git merge --ff-only tmp Thanks Ian _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
