https://blog.csdn.net/wwd0501/article/details/80676807
eclipse git trunk code into branches:
1, items to the branch switching;
2. Select the right project - "team -" merge - "orgin / master (Remote Tracking)
3、Merge options选择Squah(merge changes into working directory,......)
Fast forward options选择默认的if a fast-forward,only update the branch pointer
4. Click Merge, after the trunk code is pulled to the local branch. In case of conflict, post-conflict submitted; there is no conflict can be submitted directly.
=============================================