Re:This is how I git
by yarcob on Tuesday November 10, 2020 @04:23PM
(#25052135)
The problem with rebase is that you must resolve conflicts for every commit. This can take a lot of effort versus a single merge at the end.
You end up doing a lot of conflict resolution when rebasing, increasing the chances that you make an error.
And if you do make an error during conflict resolution, there will be no record of it because you've rewritten history.
We stopped most rebases for this reason, and just do normal merges. Conflict resolution is easier, and if we do make a mistake, it's at least documented in the history, and it's easier to fix.
You end up doing a lot of conflict resolution when rebasing, increasing the chances that you make an error.
And if you do make an error during conflict resolution, there will be no record of it because you've rewritten history.
We stopped most rebases for this reason, and just do normal merges. Conflict resolution is easier, and if we do make a mistake, it's at least documented in the history, and it's easier to fix.