I have a branches called dev and master and some feature needs to be merged to both branches. Now I usually follow is branch master for feature branch and merge to both bran