Quantcast
Channel: Recent Questions - Stack Overflow
Viewing all articles
Browse latest Browse all 15671

Resolving merge conflicts between protected branches [duplicate]

$
0
0

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):

  1. See that the conflicts exist on the PR between feature and main
  2. git checkout main && git pull
  3. git checkout feature
  4. git switch -c fix origin/feature --no-track
  5. git merge master
  6. Fix merge conflicts, git add ., git commit etc
  7. Push, create new PR, review, merge into feature
  8. See that the same conflicts still exist on the PR between feature and main

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.


Viewing all articles
Browse latest Browse all 15671

Trending Articles



<script src="https://jsc.adskeeper.com/r/s/rssing.com.1596347.js" async> </script>