The key to solve conflicts: see the two conflicting diffs
ID: git-tips/the-key-to-solve-conflicts-see-the-two-conflicting-diffs
Git tips The key to solve conflicts: see the two conflicting diffs by
Ciro Santilli 36 Updated 2025-04-24 +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.
New to topics? Read the docs here!