Prerequisite: Ensure that the local branch and master are the latest version
Branch name: F-20180412
Operation steps (as shown in the figure):
1. Switch to master locally
2. Select branch "F-20180412" in Local Branches
3. Select "Merge"
4. Push the local master to the remote master (if there is a conflict, resolve the conflict first)