I had two branches based on one version of the “Main” branch. I merged one of them, and now in the proposal for the other, it seems to be attempting to revert the changes just made. How can i rebase this other branch onto the current version of the “Main” branch?
Hey @abi you should be able to resolve this my merging the latest main into your current branch. To do this select resolve changes under the three dots next to your branch.
and then select the main branch. If there are any conflicts you should be able to resolve them after you attempt the merge
