Question

What are the types of Git merges?

Answer 1

There are three main types of merges in Git:

1. Fast-forward merge: If there are no new commits on the target branch, Git simply moves the pointer forward.
2. Recursive merge: The default merge strategy for non-fast-forward merges that involves creating a new commit that has two parent commits.
3. Three-way merge: Uses three commits: one from each branch and their common ancestor to resolve changes.