We have set up a master branch which is protected and branches which will merge into the master - pretty simple stuff.
However we have had a number of merge conflicts where a file exists on master but is deleted on the branch but haven’t figured out how to resolve this.
The approvers have the ability to do so but that isn’t a great solution.
I know there was a feature request for resolving conflicts within the UI but that is now on the back burner.
How does everyone else get around this? (This might be a stupid or basic question)