I have created a branch named dev.
I have done a pull request to send dev code to master, when I do this pull request it tell me:
50+ conflicts prevent automatic merging "Next steps: Manually resolve these conflicts and push new changes to the source branch."
Where do I go from here? I just want all the dev branch to replace whatever is in master. I see no options to resolve these conflicts.