Git plug-ins in eclipse merge multiple branches

Method/Step

1. 1

   First we merge the main branch with the other branch and switch to the main branch

   . Span class= "Exp-album-enter-mask" > steps read
2. 2

   Second Step right-click Team---merge

3. 3

   After you pop up the merge box, it is recommended that you first merge locally and push to remote, select the merge target branch in the local branch other, point to merge.

4. 4

   This merge does not conflict, we first submit the master branch to the remote, and the merge of the other branch is complete

5. 5

   Merges the master and dev branches, this process will appear branching, we want to ensure that the other branch commits the content is not lost. The first step to switch to the main branch, some small partners to switch branches, the box that appears because you modify the content is not submitted can be submitted to the local repository can also be submitted to the remote warehouse, we first submitted to the local (not appear to enter the next step)

6. 6

   We right click on the Select Merge,merge box to select our merged branch

7. 7

   Merge after the conflict file, we first deal with the conflict file, first remove the conflict symbol, leaving only the code we want. Be aware of the duplicate code of the master branch and Dev. Conflict handling is generally handled manually.

8. 8

   After the conflict has been processed, the add to index is submitted to the remote after the merge is complete

    

Git plug-ins in eclipse merge multiple branches