Merge

Summary

`git merge` combines the history of one branch into another, creating a merge commit (or fast-forwarding) to bring the changes together. Merge preserves the relationship between histories and is particularly useful when multiple lines of development need to be brought together explicitly.

• 1Merge a feature branch into `main` and inspect the resulting commit graph. Validate your understanding by applying it in a small practical example.
• 2Learn the difference between a fast-forward merge and a 3-way merge. Focus on understanding the underlying reason it works, not only memorizing the definition.
• 3Deliberately create a merge conflict in a sandbox repo to practice resolving it.