Discussion about this post

User's avatar
Kevin E Levin's avatar

The C2 then C3 example nails why revert conflicts feel so unintuitive. You are not rewriting history. You are adding a new commit that still has to coexist with later edits to the same lines. When a revert conflict lands on a shared branch, do you resolve it yourself before opening the PR, or do you prefer leaving the conflict markers for the original author of the later commit to reconcile?

No posts

Ready for more?