@bascule git merge --try-a-little-fucking-harder-this-time
How does git have merge conflicts I can fix simply by deleting the commit boundary markers? o_O
-
-
Thanks. Twitter will use this to make your timeline better. UndoUndo
-
-
-
@bascule 3-way merge is too dumb to know that A+B should be chosen over A alone, B alone, or some C. https://raw.github.com/tonyg/revctrl.org/master/output-raw/ThreeWayMerge …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.