
In plain words
Merging takes the commits from one branch and adds them to another. Most often you merge your feature branch back into main once the work is ready.
git switch main git merge new-homepage
If both branches changed the same lines of the same file, Git cannot guess which version to keep and stops with a merge conflict.

Found this useful?
Every lesson stays free. Tap the thumbs up so we know what works, or say thanks with a soda or a coffee: it pays for hosting and new lessons.


