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 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 -
-
-
@bascule OH YEAH I talked with you about this before. Squashing is bad. Means you can't use git-bisect, or make short, descriptive commits. -
@languagehacker just used bisect the other day. it's a lifesaver when you need it -
@bascule git-bisect is the debugging tool you never realized you needed until you use it for the first time. Just like crack. -
@languagehacker yeah, it's great when you hit something totally counterintuitive then work your way back to the problem
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.