how to merge changes from a different branch
Conceptually, a merge branches operation has four steps: 1  Developer selects changes in the origin. 2  Source control tool applies some changes automatically to the target. 3  Developer reviews the results and resolves any conflicts.  Commit.