Closed mvolz closed 6 years ago
@mvolz LGTM, but GH says there are conflicts. Could you rebase the patch on top of master, please?
Does it? It says "This branch has no conflicts with the base branch" ? for me...
@mvolz if you switch to "rebase and merge" (the preferred way), it does. This means that you simply need to git rebase origin/master
locally on your branch and then git push -f
done