Can anyone point me to documentation on why Git fast-forwards a merge commit when you pull with the rebase strategy? https://github.com/Wikia/app/commit/fae31ad1291c6bb57be6a8f68f144c1140822be9 …
@languagehacker yeah, people doing that mostly use a standard merge workflow and rebase locally immediately prior to merging
-
-
@bascule If you have a highly active origin, though, it's more frequent pain than edge case. Manual fetch & rebase --preserve-merges works. -
@languagehacker we have a highly active origin :) Our general workflow is pull master, rebase your feature branch, send PR, squash merge -
@bascule Interesting. We're trying to implement a take on http://nvie.com/posts/a-successful-git-branching-model/ …. We want the clear history and atomicity merge commits offer. -
@languagehacker sounds like you want a quick way to rollback a feature? The easiest way to do that is to squash :| -
@bascule We're trying not to ever require a forced push to origin. Doesn't squashing result in that? -
@languagehacker no, squashing just rolls an entire feature branch into a single commit
End of conversation
New conversation -
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.