merge between git branches
1. Create a branch on the trunk
2, switch to branch development commit branch
3. The branch should be based on the branch to synchronize with the trunk. The version corresponding to the merge trunk can be used (similarly when the trunk needs to be merged with the branch), it is much clearer to merge with the function block (it is not necessary to switch to the master, and then merge after pulling, directly Merge automatically compares the difference)
First pull the branch (in this case, pull the master directly, (pull other branches)), and then merge on the branch (that is, merge the master) (and vice versa)