Unexpected result clicking merge

[AndrewMcLachlan]

I hoped stacks would solve a problem for me as I often have a few stacked PRs that are squash merged. Due to the loss of history the later PRs end up with conflicts.

My first stack had 2 PRs. Both were approved. I thought clicking merge on the last one in the stack (the first one raiseD) would merge the whole stack. Instead it just merged that one and left me with exactly the same problem. What was worse was that I couldn't do a simple one file conflict fix in the UI, I had to do it locally.

I would consider differentiating between merging a single PR and a whole stack in the UI so it's clear (e.g. one button for each), and allowing simple conflicts to be done in the UI.