git merge

学习资料

教程

Git Merge:

git checkout -b feature/v1.0_r2 origin/feature/v1.0_r2
git checkout -b feature/v1.0_r2_mrfix origin/feature/v1.0_r2_mrfix
git checkout feature/v1.0_r2_mrfix
git merge --no-ff feature/v1.0_r2
git mergetool
git status
Git mergetool
Git commit -m "merge r2 to r2_mrfix"