Slackbot
06/16/2023, 8:47 AMJacob Gold
06/16/2023, 2:56 PMEunjae Lee
06/19/2023, 8:37 AMWere 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?
Eunjae Lee
06/30/2023, 7:59 AM