Ruby
China
Topics
招聘
Wiki
酷站
Gems
Sign Up
Sign In
@somesky
Member
NO. 4881 /
2012-12-06
1
Topics
/
1
Replies
0
Followers
0
Following
0
Favorites
No GitHub.
Overview
Topics
Replies
Favorites
Following
Followers
Git
git 进行合并的时候,与服务器上代码发生了冲突,如果我用本地的覆盖服务器上的,我该操作?这种也需要手动合并吗?
somesky
• Last by
iceskysl
replied at
May 15, 2014
7