📅  最后修改于: 2022-03-11 14:51:23.003000             🧑  作者: Mango
git checkout master
git merge new-feature
git branch -d new-feature
# or, to generate a merge commit (for merge dicumentation purpose)
git merge --no-ff new-feature