From: http://blog.csdn.net/hongchangfirst
When using GitHub for collaboration, we often need to install the corresponding software on the client. smartgit is a very good software, but it only needs to be paid. We can use the non-commercial cial version.
When using smartgit, pay attention to the following points:
1. The file is the smallest unit for synchronization. Each person has the ownership of a file. Others should not make any changes (the Protocol is better than the configuration). If two people jointly maintain a file, one person completes the synchronization operation.
2. The latest version of pull on GitHub is required before pushing to GitHub.
3. Before pushing, review the modified version (only push files with ownership). You can click the review button in the upper right corner to compare the similarities and differences between the old and new versions.
Regarding the issue of graph branches on GitHub, if it is well established that each person performs operations in a serialized manner based on the above points, there will be no "branch". Of course there is no problem with the branches. This is a normal phenomenon and GitHub also supports this.
If no other branch is required, we need to select the current branch master for push during push.