Command:
git merge --no-ff -s "ours" release-branch
Removal of branch label from git tree:
git branch -D release-branch
It will make "diamond" in git history BUT it will not merge any changes from release branch to master. Blue dots are former "release-branch"

No comments:
Post a Comment