When fixing an automatic merge failure, Stash provides step by step instructions under the More information link. Our developers typically copy and paste the steps and execute locally. The problem is that Step 2 does not include a git pull. The steps are fine if the developer does not have the branch in question checked out locally. They fall down if they are switching to a (potentially stale) local branch copy.

In the example below we would like to see a git pull before the merge in step 2.

Example

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

git fetch origin release/8.0.3

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

git checkout release/8.0.5 
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