Linus Torvalds wrote: > > On Tue, 10 Jan 2006, Linus Torvalds wrote: >> You can _undo_ the revert, so it's not permanent in that sense. Just do >> >> git reset --hard origin >> >> and your "master" branch will be forced back to the state that "origin" >> was in. > > Btw, you can try this (careful - it will also undo any dirty state you > have in your working tree), and then do the "pull" again (which should now > be a trivial fast-forward) and then just try to do the "git revert" on the > new state. Just by stumbling around and trying things at random, I did a 'git-checkout origin' which *seemed* to resolve the merge-conflict, but left me feeling uneasy because I don't really understand what I'm doing. Can you give a short explanation of the difference between 'git reset --hard origin' and 'git-checkout origin'? > An even better option is obviously to figure out _why_ that commit broke > for you in the first place, and get it fixed up-stream... I'm still waiting for the insulting email from the developer ;o) How long should I wait for a response before I start bugging other people? - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Wed Jan 11 07:44:44 2006
This archive was generated by hypermail 2.1.8 : 2006-01-11 07:44:51 EST