This message was deleted.
# how-do-i
s
This message was deleted.
j
Hi @Eunjae Lee — I'd like to understand this case better. Were there conflicts between the third branch and your main branch that you needed to resolve, or are you saying that we incorrectly showed that the branch had conflicts?
e
Hi @Jacob Gold I was way after that message. Umm.. let me write down what I remember.
Were there conflicts between the third branch and your main branch that you needed to resolve
↑ YES. The first two PRs were merged correctly, but the third PR wasn't. I went to GitHub, and the PR page showed me actual conflicts there. So I resolved the conflict on the GitHub's PR page. After that, I've noticed something weird. The third branch didn't have its own commits, but included all the commits from the first and the second branches. Not sure how they ended up being there. So I manually dropped specific commits and force-pushed. Does it ring a bell to you?
Any idea on what could've gone wrong @Jacob Gold?