I'm trying to merge a commit from Dev -> Master in the web interface however I get a message saying "This branch is out-of-date with the base branch Merge the latest changes from master into Dev."
The problem is Dev is also a protected branch So I'm not able to do this. I've tried creating branches which mirror master, merging dev into it then raising a PR from the feature branch into dev (and the opposite) however the conflicts remain. These changes were made in the command line.
How can I resolve this while maintaining my workflow of feature branch -> Dev -> Master
