关于在开源中国上使用git代码托管的问题

Question

我之前一直用的svn，近期开始学习如何使用git 基本用法已经差不多了，但是有个问题一直没有整明白，我代码托管在开源中上，一个人开发都好说，但是现在我和另一个android人员一起开发，这个就需要有主分支与侧分支这么一说，如何在开源中国上进行多人合作开发？？？？就是说如何创建分支以及合并代码！请求大神们解答！跪谢！

Answer 1

In multi-person development, the main branch is generally locked when it is master. Multi-person development needs to pull its own branch from the latest main branch master. When the development is completed, you can deploy your own branch for testing. If there is no problem, merge it to the master branch. On the above, if multiple people develop and operate the same file, conflicts may occur. At this time, the conflicts should be resolved manually and the merge is completed.

There are a lot of documents online, you can refer to them
http://www.runoob.com/w3cnote...

Hope it helps you

Answer 2

The tutorials on how to use git on the Internet are very detailed. Just pick up a project and follow the tutorial and try it slowly to understand. It is best to ask some detailed questions here.

Answer 3

Git workflow

• git flow(recommended)

• github flow

• gitlab flow