TIL @github's rebase-merge does not FF even when it could. It gratuitously makes conflicts with the contributor's tree. Eeww.
Anyway it seems you just have to avoid using the @github web ui completely to get proper git behavior... *sigh*
-
-
They make it painful to test locally before merging and to merge changes locally. They keep making the UI worse for doing that.
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.