Git merge considerations-If merge fails, it will lead to incomplete merge

When git merge is running, you must check the final output information. If the output information is a merge failure, it is best to check where the merge fails. Then (note that there is a last point):

 

Git reset head. Git checkout --.

 

To all undo merge, and then to the branch of merge, manually modify the problem of merge failure. And then re-merge.

 

If there is no report failure in merge's output information, but let's fix content conflict, merge is OK. In this case, you only need to open the unmerged file and search for the merge keyword, then, fix the content that failed to automatically merge.

 

If merge fails, it will lead to incomplete merge, that is, some files may not be accessed by merge.