git merge merge branches

https://git-scm.com/book/zh/v2/Git-%E5%88%86%E6%94%AF-%E5%88%86%E6%94%AF%E7%9A%84%E6%96%B0%E5%BB%BA%E4%B8%8E%E5%90%88%E5%B9%B6  --goood

 

If you are in the current local branchX, then, you want to merge local branchY over, then execute git merge branchY

If the conflict, namely X and Y branch at the same time that the same line in a file, git will be prompted to merge conflicts, while git where you can modify the local file conflict will be indicated. At this point, you can run git mergetool, will start the default mergeTool, select the version they need to keep, save and close the tool , you can perform commit.

 

Git conflict when prompted, indicate the current status line at branchname | MERGING, normal, not from Care .

 

P4Merge document:

https://www.perforce.com/manuals/v17.3/p4merge/#P4Merge/diff-merge.p4merge.html on the pop-up interface can be found by help