It will take a while for this process and all of the commands to become a natural part of the way you work. Until that happens it is often useful to have a short concise cheat sheet of the command for accomplishing each task.
Exercises
1.
Match the tasks on the right with the appropriate git command listed on the left. The <...> notation indicates parameters that are needed to customize each use.
git merge <target>
Merge changes from source branches into a target branch
git merge --abort
Undo a merge that failed due to conflicts
git mergetool
Launch the configured graphical merge tool
Hint.
Note that the tasks listed are in approximately the same order as they appear in the sections of this chapter.