In older version of bitbucket/stash when a merge from master to dev branch was requested there were instructions given to run that would should the developer how to resolve those by hand. The instructions ended up merged on the dev branch.
Now the instructions for the developer end of with a merge on the master branch. Can anyone tell me why or anyway to fix this.
