📅  最后修改于: 2022-03-11 14:57:12.354000             🧑  作者: Mango
(on branch development)$ git merge master
(resolve any merge conflicts if there are any)
git checkout master
git merge development (there won't be any conflicts now)