Merge changes from one branch to another (Git)

If a feature branch is behind master, you can sync that branch, using a merge, into your feature branch.

  1. From the left-side menu, hover your mouse over the right side of the Branches label until you see the word Show.

  2. Click Show to expand the list of branches.
  3. Double-click the feature branch that is behind to switch to that branch.
  4. Click the Merge button.
  5. From the popup that appears, select the commit you want to merge into your feature branch.
  6. Check the Create a commit even if merge resolved via fast-forward option at the bottom.
  7. Click OK.
    Your feature branch now has the same commits as your master branch.
Last modified on Sep 13, 2016

Was this helpful?

Yes
No
Provide feedback about this article

Powered by Confluence and Scroll Viewport.