Git merge conflicts during PRs

Question

I did a bit unusual setup where repositories were first set up, instead of populating the master branch with project files, a transfer branch was c