A colleague of mine made some major file changes without checking open branches that were under review, in total almost 1000 files were moved and half of those were touched in one PR while about 10% of the other half were touched in the other PR. Of course, major merge conflicts ensued when he merged to master.
However, everytime I try to rebase from aster to resolve the conflicts, the conflicts remain present in GitHub so I cannot merge. Both PR's contain an immense amount of work, so my blood pressure is up quite a bit in fear of having to redo stuff.
Has anyone encountered these seemingly unresolvable conflicts?
- git checkout master
- git pull
- git fetch -p -t
- git checkout
- accept all current for all changes
- git add .
- commit & continue
After doing this (multiple times, also following git merge master instead of git rebase) the conflicts remain however. What's weird is that the path names are all correct in the new format.