How to achieve this in Source Tree, Was able to perform this steps from Terminal but need to know how to do it from UI?

How to achieve this in Source Tree, Was able to perform this steps from Terminal but need to know how to do it from UI?


Merge conflict

This pull request has conflicts. You must resolve the conflicts before you can merge:

Step 1: Fetch the changes (saving the target branch as FETCH_HEAD).

git fetch origin Branch1 

Step 2: Checkout the source branch and merge in the changes from the target branch. Resolve conflicts.

git checkout Reverting git merge FETCH_HEAD

Step 3: After the merge conflicts are resolved, stage the changes accordingly, commit the changes and push.

git commit git push origin HEAD

Step 4: Merge the updated pull request.

1 answer

I was able to do the following:

Step 1.

In SourceTree click Fetch

Step 2.

Checkout the source branch in the branch browser

Click merge and choose Branch1 to merge from (called the target branch above)

Step 3.

Commit

Push

Step 4.

Merge in Stash

Suggest an answer

Log in or Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

429 views 0 1
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you