Cannot pull into a repository with state: REBASING_MERGE
I'm running into a situation where I'm unable to deploy to one of my target branches and getting an error
Cannot pull into a repository with state: REBASING_MERGE
I did do a force push to the branch (Branch B) and attempted to go back to the original commit hash but this error still appears.
Oddly enough, it is now impacting my commit branch (Branch A) for another org and I'm unable to find a workaround for it. Branch A was not rebased at any point but I did attempt to get Branch B on the same commit hash as A.
Attempting to make a whole new git configuration with new branches is also not working for me. In those cases I'm getting "Conflict" errors even though there should be no difference between the content since the branches are on the same commit. I'm pretty stuck now with no way to resolve this problem.
Is there any way to clear this "Rebasing Merge" stage?
Cannot pull into a repository with state: REBASING_MERGE
I did do a force push to the branch (Branch B) and attempted to go back to the original commit hash but this error still appears.
Oddly enough, it is now impacting my commit branch (Branch A) for another org and I'm unable to find a workaround for it. Branch A was not rebased at any point but I did attempt to get Branch B on the same commit hash as A.
Attempting to make a whole new git configuration with new branches is also not working for me. In those cases I'm getting "Conflict" errors even though there should be no difference between the content since the branches are on the same commit. I'm pretty stuck now with no way to resolve this problem.
Is there any way to clear this "Rebasing Merge" stage?
