git merge is frequently used during development of projects managed by git. There are many common questions about
git merge and I find most are solved and discussed on StackOverflow. Here, I summarize useful ones so that others who want to learn
git merge need to do the search again.
Merge, rebase, fast forward and conflicts
Table of Contents
- Differences between git rebase and git merge.
- To handle conflicts.
- Usage of fast-forward merges in git.