On Mon, 2007-01-15 at 12:42 -0800, Eric Anholt wrote: > > If you know what branch was merged before the git conversion that's > causing you your pain, one way forward might be to do: > > git-checkout master > git pull -s ours . that-merged-branch > git pull . my-branch
It's more complicated. The trunk was merged onto the branch in what's now called commit 6d104cb932080c5c0d951fbc0ec6d30fb7ebef45 . According to grep, it looks like the trunk was at what's now called commit faba58c447c9eeeea0f7ef405fa1ba1f73991375 . So, here's a proposal for creating a new branch vbo-0.2 ready for merging current master: git-checkout -b master-merge faba58c447c9eeeea0f7ef405fa1ba1f73991375 git-checkout -b vbo-0.2 6d104cb932080c5c0d951fbc0ec6d30fb7ebef45 git-pull -s ours . master-merge git-pull . vbo_0_1_branch Merging master after this still creates some conflicts, but it looks manageable. -- Earthling Michel Dänzer | http://tungstengraphics.com Libre software enthusiast | Debian, X and DRI developer ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
