This article originates from: Http://blog.csdn.net/hongchangfirst
When using GitHub to do synergy, we often need to install the appropriate software on the client, Smartgit is a very good software, but to pay, we can use the non-commercial version.
When using Smartgit, you should pay attention to some points:
1 with files as the smallest unit of synchronization, everyone has ownership of a file, others do not make any changes (the protocol is better than the configuration), if two people jointly maintain a file, then one person to complete the synchronization operation.
2 Pull the latest version from GitHub before push to GitHub.
3 Before the push, check against the version of your own changes (only push own ownership of the file), you can click on the upper right corner of the review button to compare the old and the new version of the similarities and differences.
On the github of graph on the branch of the problem, if the protocol good everyone in a serialized way to follow the above points, the "branch" will not appear. Of course, there is no problem with the branch, which is a normal phenomenon, GitHub also support to do so.
If no other branch are needed, we are going to push by selecting current branch master for push.