merge & branch & stash
git branch -D branch
e: dev
abc dev
conflicts fixed
multi-branch manage
Merge branch 'dev'