🔀Merge
Also known as Git Merge
Joining work from one branch into another. Both sets of changes end up in one place.
Think of it like
Think of it like two streams meeting to make one river. The water from both ends up in one place.
Example
Emma finishes dark-mode and merges it into main. Her new style is now part of the main code.
Why it matters
Merging is how separate work becomes one product. It happens many times a day on a busy team.
Definition
Example code
console
$ git merge dark-mode
Updating 6dd6d2c..d331bff
Fast-forward
style.css | 1 +Common mistake
Key takeaways
- 1Two lines become one. Changes from both sides are joined.
- 2Fast-forward if it can. No new commit when one side is still.
- 3Conflicts need you. Same lines changed means a choice.