合并流程

作者: wenny_6081 | 来源:发表于2018-05-21 20:23 被阅读0次

➜ ec-usercenter git:(develop) git log
➜ ec-usercenter git:(feature-league-20180409) ✗ git add .
➜ ec-usercenter git:(feature-league-20180409) ✗ git commit -m '去掉邀请码'
➜ ec-usercenter git:(feature-league-20180409) git log
➜ ec-usercenter git:(feature-league-20180409) git pull
➜ ec-usercenter git:(feature-league-20180409) git push
➜ ec-usercenter git:(feature-league-20180409) git status
➜ ec-usercenter git:(feature-league-20180409) git checkout develop
➜ ec-usercenter git:(develop) git merge feature-league-20180409
➜ ec-usercenter git:(develop) git status
➜ ec-usercenter git:(develop) git push
➜ ec-usercenter git:(develop) git log
最后在Git里查询下，如果正常就merge到release；冲突就解决