I have been using svn before, and recently I started to learn how to use git. The basic usage is almost there, but there is a problem that I haven’t figured out yet. My code is hosted on open source, and it’s easy to develop by myself, but now I and another If an Android person develops together, this requires a main branch and a side branch. How to carry out multi-person cooperative development on open source China? ? ? ? That is, how to create branches and merge code! Ask the gods for answers! Kneel down and thank you!
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
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
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.
Git workflow
git flow(recommended)
github flow
gitlab flow