Smartgit Use one---merge branch __git&smartgit

1. Use tool: Smartgit

2. Scenario: There are two branches: one own Development Branch, a general framework branch, as shown in the Figure red box, I developed my own on the Hudfang-local branch, I led the development on the Feature/demo branch, he made the changes synchronized to the demo branch, I made a modification commit to the Hudfang-local branch. Now I'm going to merge the code he's newly submitted to the Feature/demo branch to my branch.

3. Methods of consolidation

(1) Commit all the changes I have on the hudfang-local

(2) switching from smartgit to Feature/demo Branch,pull

(3) switch back to Hudfang_local branch (right key check out)

(4) Right-click Feature/demo Branch, select Merge

(5) In the pop-up dialog box select the merge to Working tree

(6) If all changes are not conflict,commit. (Select all changes, right click Commit)