Git解决冲突
yxkj@yxkj ecloud-yjyp-service % clear
切换到需要合并的目标分支
yxkj@yxkj ecloud-yjyp-service % git checkout dev
Switched to branch ‘dev’
Your branch is behind ‘origin/dev’ by 3 commits, and can be fast-forwarded.
(use “git pull” to update your local branch)
拉取服务器端的代码
原创
2020-12-24 14:21:18 ·
1712 阅读 ·
3 评论