标签：merge git merge clone ast base 冲突 oca pre tin
本地创建分支
git clone master branch
checkout -b local
提交分支
git checkout master git pull git checkout local git rebase -i //合并提交 git rebase master---->解决冲突--->git rebase --continue git checkout master git merge local git push
标签：merge git merge clone ast base 冲突 oca pre tin
原文地址：https://www.cnblogs.com/fenle/p/11392664.html
