0

So I have branch A and B, I rolled back one commit on B, then created a merge request from A to B, then git is complaining about merge conflicts.

I know if I checkout both branches locally, then resolve the conflicts locally then push A to git again, and that should fix the conflicts, the problem is that both branch are protected, and I can't push commits directly from either A or B, is there a way that I can fix the merge conflict?

Thanks.

wawawa
  • 2,835
  • 6
  • 44
  • 105
  • is there a special reason why you don't want to solve the conflict? – eftshift0 Nov 05 '20 at 15:11
  • So, you would have to say, merge B into A, solve the conflict, wrap the merge, then push into a feature branch, create a PR into A, then when that is accepted and merged, you will be able to merge A into B? – eftshift0 Nov 05 '20 at 15:13
  • I don't want to change the current state of A, is there other solution? – wawawa Nov 05 '20 at 15:14
  • Conflicts are a subject of their own. There are plenty of guide on how to solve then, this is _mine_, particularly, no tracking, no monetizing: http://ezconflict.com/en/conflicts.html – eftshift0 Nov 05 '20 at 15:14
  • You can do the exact same path I described switching the branches. Merge A into B, solve the conflict, wrap up the merge, then push into a feature branch, create a PR, merge into B, then create a PR to merge B into A (this is all like github flow.... git standalone git it's a little simpler but still the same ideas behind it) – eftshift0 Nov 05 '20 at 15:16
  • Sort it, thanks you very much @eftshift0 – wawawa Nov 05 '20 at 15:50

0 Answers0