git resolve code violations by fork

　　In general, if we happen when submitting the code of the conflict, this time want to ensure that their branches are not contaminated, while not decontaminated remote branches, under normal circumstances we will go to create a new branch to deal with conflict, but this branch will cause chaos, there will be many branches are added, a method in which a solution is to use the fork to go to a copy of the source file; then cloned into their local, time to put resolve conflicts in their own fork warehouse modified, but must pay attention to this, look at this every time the code from the original warehouse lira in solving the conflict, the specific operation

　　1. Cloning warehouse fork codes; install dependencies;

　　2. Add the original warehouse source, and set up an alias, for example git remote add one git @ com (address of the remote repository)

　　3. code corresponding branch pulling original repository: git pull one feature / test

　　4. Then merge, conflict resolution corresponding to the two branch code;

　　5. Adoption of the merge request or git push one: pushed to the remote repository to the branch name