Replies: 2 comments
|
I encountered the same problem today. 4 PRs in the stack, top of the stack is showing conflicts. Running through @LukGer I tried your suggestion to unstack, retarget, and restack. It worked perfectly. First, I actually tried to unstack and restack without retargeting, and the same conflicts appeared, no success. So, I took the top PR in the stack, retargeted it to |
0 replies
|
I unstacked and saw the same phantom merge conflict. Then I closed and reopened the PR twice and it went away. |
0 replies
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Uh oh!
There was an error while loading. Please reload this page.
I have a stack like this
develop
/
feature_1
/
feature_2
and the feature_2 PR shows merge conflicts despite there being none (feature_2 sits fully on top of feature_1)
I resolved it by:
All reactions