As members, git operational processes:
Merge Conflicts: causes, the information does not exist in the local repository remote repository, resulting in the two versions are not the same.
Merge Conflicts generally two types: 1 remote and local modify the same file at this time, if not modify the scope, it will automatically merge, but will generate extra information, we remove the extra information off the hook.
2. There is a remote and local a.txt not, there is a local b.txt, but no remote, this time directly to the merger on the line.
Branch introduction :
The following is a master merge to develop, the work would not be so dry, be careful! ! !
The merger is to develop the master, it is commonly used in this work.
Deleted branches
