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.
I was able to do the following:
In SourceTree click Fetch
Checkout the source branch in the branch browser
Click merge and choose Branch1 to merge from (called the target branch above)
Merge in Stash
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...
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!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG