I want to make the pull request merge into develop from the feature branch by default.
I\'m advocating the use of git flow, so when a pull request is submitted for a fea
Instead of using master and develop branches, use stable and master.
Then it is usually good to merge them before tagging a new version, so there is none or only little diversion. I use this schema and usually stable follows master with small delay and merges are mostly fast-forward.
To keep master branch deployable, merge feature branches when they are ready. But since you have stable branch, new features does not have to be well tested.