git merge 的基本流程 | Git

本章覆盖：switch target branch；`git merge source`；merge result；index；working tree；auto merge；conflict state；commit；abort；pre-merge clean working tree；merge changes current branch。