It really frustrates me when people treat "ha ha, Git is so hard to use!" as some sort of wacky shared experience of the programming community, as opposed to something intolerable that we need to be fighting against.
git commit-tree using 2 parents & the tree id from the new one, then git branch -f
-
-
That's assuming you're just merging back with no changes on your side. If there's actual merge work to do, you need a script with temp tree to merge in.
Thanks. Twitter will use this to make your timeline better. UndoUndo
-
Loading seems to be taking a while.
Twitter may be over capacity or experiencing a momentary hiccup. Try again or visit Twitter Status for more information.