Glossary

Merge

Combining the changes from one Git branch into another.

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.

See Branches without fear.

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.

Buy me a sodaBuy me a coffee

Want more on this?

Tell us which part was not clear, ask for a follow-up lesson, or request a lesson on any topic. We read every request.

I would like
Only to tell you when it is ready.

WhatsApp

Join the channelChat with us

Free lessons and updates in the channel. Questions about learning or training? Chat with us.