The key to solve conflicts: see the two conflicting diffs
ID: git-tips/the-key-to-solve-conflicts-see-the-two-conflicting-diffs
The key to solve conflicts: see the two conflicting diffs by
Ciro Santilli 35 Updated 2025-03-25 +Created 1970-01-01
The key to solve conflicts is:
You have to understand what are the two commits that touched a given line (one from master, one from features), and then combine them somehow.
Or in other words, at every rebase conflict we have something like:Therefore there are 2 diffs that you have to understand and reconcile:
master-commit feature-commit
| |
| |
base-commit------+
|
|
base-commit
tomaster-commit
base-commit
tofeature-commit
New to topics? Read the docs here!