#[1], clone the complete Git repository (including code and version information) from the server to On a single machine.[2]. Create branches and modify the code on your own machine according to different development purposes.[3] Submit the code on the branch you created on a single machine.[4], merge branches on a single machine.[5]. Fetch the latest version of the code on the server, and then merge it with your main branch.[6], generate a patch (patch), and send the patch to the main developer.[7] Based on the feedback from the main developer, if the main developer finds that there is a conflict between two general developers (a conflict that can be resolved through cooperation between them), they will Ask them to resolve the conflict before one of them commits it. If the lead developer can resolve it himself, or there are no conflicts, pass.[8]. Generally, the method for resolving conflicts between developers is that developers can use the pull command to resolve conflicts. After resolving the conflicts, they can submit patches to the main developer.
1. Check the email or check the submission status of general developers through other methods.2. Apply patches and resolve conflicts (you can resolve them yourself, or you can ask developers to resolve them before resubmitting them. If it is an open source project, you also need to decide which patches are useful and which ones use).3. Submit the results to the public server and then notify all developers.
## [1] , suitable for distributed development, emphasizing individuals. [2], The pressure on the public server and the amount of data will not be too large. [3], fast and flexible. [4], Conflicts can be easily resolved between any two developers. [5], Work offline.
The above is the detailed content of Introduction to the advantages and disadvantages of git server. For more information, please follow other related articles on the PHP Chinese website!