feature
(protected) has conflicts with main
(protected) which I cannot resolve.
I have researched many solutions and they all come back to a similar answer involving a third branch (fix
in this example).
My steps to resolve (intentionally verbose):
- See that the conflicts exist on the PR between
feature
andmain
git checkout main && git pull
git checkout feature
git switch -c fix origin/feature --no-track
git merge master
- Fix merge conflicts,
git add .
,git commit
etc - Push, create new PR, review, merge into
feature
- See that the same conflicts still exist on the PR between
feature
andmain
I tried this on a new (public) repo I created and it worked fine. But on my work project repo it does not and I cannot fathom why.