3 ms·
I have found that rebasing often creates more issues than it is worth it. Only when there are only a couple of commits I might try but you are still rewriting h
by rahkiin 9y ago
I have found that rebasing often creates more issues than it is worth it. Only when there are only a couple of commits I might try but you are still rewriting history: something that is destructive and needs force-pushing which I almost always disallow.
Merging does create a merge commit which is sometimes annoying (when you are merging a single-line commit, for example). It does however preserve full history.
- u801e 9y ago> It does however preserve full history. Frequently, I see a commit history like: Implemented feature Forgot semi-colon Fixed syntax error Addressing review comments Removed unnecessary method History like that, other than the initial commit, is not very useful. It makes more sense to rebase to clean up the commit history such that it becomes a logical series of commits, which can then be viewed via git log or git blame.
- foo101 9y agoWhy would rebase require force-pushing? You can always rebase the pull request on the most current master. There would be no conflicts then and no need to force-push. If the push fails because the master has changed during the few minutes you spent in rebasing, just rebase again on the most current master and push again. No force-push is required.