Mark Manually Merged Pull Request as Resolved

Carolyn Van Sly1

I have a pull request which for some unknown reason I was not allowed to merge from the Stash website. The Merge button is disabled with the error "This pull request cannot be merged automatically". I could not figure out why as it is a fast forward merge without any conflicts...

There were no instructions on how to manually resolve the merge on the Stash pull request page. I remember previous versions provided instructions which would have been helpful.

So I ran the following commands on locally

git fetch
git checkout master
git merge --no-ff --log cool-feature-branch
git push

The merge commit does include the correct parents (one from master and the other from the single commit on my feature branch) and the merge commit message includes the id of the pull request "Merge pull request #1 in FOO/BarRepo from cool-feature-branch to master". However the pull request remains open and I don't see any way to mark it as resolved and link back the merge commit on master.

Can someone please help me understand why I couldn't merge using the website and how to resolve my pull request?

cofarrell

Hi Carolyn,

If you hover over the warning message it will have a link with "More information" that will show you the exact reason(s) that you can't merge. It might not (necessarily) be related to a clean merge, it can also be about other restrictions such as minimum number of reviewers or broken builds if you have any of that configured. If the problem is related to a merge error the instructions will show up as normal on the overview tab saying "This pull request can't be merged".

If you merged and pushed as normal then I would also expect Stash to make the pull request as merged. Is the most recent commit of the PR definitely the same as the commit that you merge locally? That is to say, you haven't done any force pushes that would result in different hashes?

My first thought is that it may be related to this issue:

https://confluence.atlassian.com/display/STASHKB/Pull+Requests+Not+Reflecting+Changes+Pushed+to+Remote+Branch+After+an+Upgrade

If that is not the case, or regardless, you may want to raise a support ticket.

Regarding your currently open PR, I would suggest just declining it. There isn't any way to "mark" it as merged but not do any work. I'm not quite sure what you would happen if you merged and the commit was already included in the target branch (it shouldn't be possible to get into that state).

Cheers,

Charles