Git Merge Type
Multiple Choice Easy
Question
What does git merge do?
Hint
merge integrates branch changes.
Explanation
git merge integrates changes from a named branch into the current branch. If the branches have diverged, Git creates a merge commit. If the current branch is behind, Git does a fast-forward merge. If changes conflict, Git pauses and asks you to resolve them. After resolving, complete the merge with git commit.
Related Resources
Related Lessons
- Git Merge
Learn git merge.
Look up unfamiliar terms
A beginner-friendly glossary explains jargon in plain English — variables, functions, DOM, Promise, and more.
Decode error messages
Plain-English explanations of common errors — what they mean, why they happen, and how to fix them.
Build real projects
Apply what you learned by building guided projects with starter code and solutions.