Re:Julia Evans: Git rebase, what can go wrong
by adhesive_wombat on Monday November 06, 2023 @12:39PM
(#38165793)
It definitely is. I have regularly seen work reverted mistakenly during a merge. There's little fundamental difference between resolving a conflict at rebase or merge, other than one resolves the conflict you would have had with your commit when you made it, and one resolves it with the final commit in the chain. You still have to consider that the right answer is often some mix of each side of the conflict.
[ Parent
| on HN ]
There are no comments on this comment yet.