3 ms·
The only issue with rebasing is if someone else has checked out the branch and now they have diverged. It's usually a simple fix, but it can get annoying. I te
by juancn 2y ago
The only issue with rebasing is if someone else has checked out the branch and now they have diverged. It's usually a simple fix, but it can get annoying.
I tend to checkout branches to do code reviews, when changes are complex a diff is not enough, I want an IDE to help me reason about the code (I sometimes even refactor and try different things just so I can understand the code better, so I can make good suggestions).
When I do this, and comment, and the other dev rebases, it's an extra step for me on the next CR cycle.
- kutenai 2y agoI train my team on how to resolve this. Every team member is able to resolve a force push onto a branch they have local. Also, we tend to avoid having multiple people work on the same branch.. so, that's also a thing. If there was a multi-person development effort, then each of those people would have to have a sub-branch of a main feature, and then they would be rebasing their work onto the 'main' feature branch.. which would ultimately be rebased on to dev.. etc.
- rednafi 2y agoNever rebase shared branches.