git rebase - Githubissues

chenchenyuyu / chenchenyuyu.github.io

记录点点滴滴

http://cychenyu.com/

2 stars 0 forks source link

git rebase #74

Open chenchenyuyu opened 6 years ago

chenchenyuyu commented 6 years ago

(add与commit，这是你在本地已经做的)
git fetch (注意不要用pull)2. git rebase
如果无冲突，转8；如果有冲突，转4
解决冲突
git add (解决了冲突的文件)
git rebase --continue
转3
git push
完成