Is it possible to do merge instead of rebase to resolve merge conflicts with the parent branch? It seems that when I do that, restacking the remaining upstack branches sometimes work sometimes doesn't. When it doesn't, it just says "child-branch does not need to be restacked on current-branch" however on Github's PR page it still says "This branch (child-branch) is out-of-date with the base branch". Sometimes it's just easier to merge instead of rebase especially if the commit log of the branch is long.