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 Join to answer
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

261 views 0 3
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
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot