Closed DillonRanwala closed 1 year ago
I tried rebasing with a force push, but that didn't seem to do anything. On my end, I'm not seeing any merge conflicts, but I can still try to make a merge commit.
I tried rebasing with a force push, but that didn't seem to do anything. On my end, I'm not seeing any merge conflicts, but I can still try to make a merge commit.
Update, I didn't rebase properly the first time. I dropped a commit which I think might have been the issue, and I'm not seeing any merge conflicts on my end.
Notes on testing in Beta before approving this change to Prod.
Therefore, I feel confident in pushing this change to Production.
😔 This branch cannot be rebased due to conflicts. Perhaps you need to rebase & force push onto your branch? Or perhaps you need to eat it and make a merge commit.