1. First, the idea of switching code branch to master branch, you can see the code we presented at the dev is not on the master
2. As shown, select a branch in the remote branch, click the triangle icon back, choose Merge into current after deployment
May appear trunk code and branch code their own conflicts 3. merger process, the need to manually resolve the conflict, will be shown in message after the completion of the merger
4. The completion of the merger only in their own local computer, not yet committed to a remote server, and finally merge good code push to the remote and you're done
note:
After the completion of the merger version has not been submitted to a remote server, then you can check if there is a problem merger, consolidation wrong can choose to revert and then re-merge
After clicking revert before the discovery of further consolidation steps will be reported about the error
You have not concluded your merge (MERGE_HEAD exists). Please, commit your changes before you merge.
At this point you can to preserve local modifications
Click the idea of the command line window Terminal
Then enter the following command to keep your local changes
git go --abort
git reset --merge
And then performing the above master merging step, recombined. After merging the code can be pushed to the distal end