Merge
Domain: Software Engineering
🎯 Motivation
Combining changes from one branch into another. Git automatically merges, or flags conflicts.
📋 Concrete Example
Merge: ‘git merge feature/dark-mode’ into main. Git combines the changes. If both branches changed the same line, conflict! Git asks you to resolve it. Otherwise, automatic merge.
🔗 Analogy
Merging is like combining two people’s edits on a group project - if Alice edited page 1 and Bob edited page 2, just combine them. If both edited page 3, line 5, you must decide which version to keep. Git does this for code.