Since the start with git, I met more than 10 times merge conflicts. Now the experience record
Generally divided into test development environment, simulation, online
1. In the local branch closing test (test) environment when he met how to resolve the conflict.
First own local content submitted. Then cut into test environment, his branch into test environment, you will be prompted eclispe this time there is a conflict, then the patience to look at the file conflict, the correct code to stay, head >>> delete this comment git
Submit, well, fit test a success
===============================
Here to remind, test branch can not close local branches , this is because many people will close their branch code to test branch, if you test a branch close to the local branch, then your local branch will be contaminated, so your local branch can not fit into the simulation branch.
2. Close the simulation branch in the local branch
The combined test branch and local branch is different, the local branch co-simulation branch, development generally do not have permission, so when the conflict happens, even if you solve, you can not directly co-simulation branch local branch. This time we should anti-together , that is close to the local branch simulation branch, the local conflicts resolved.
================================================== ================================================ Note that the simulation can be close to a branch of the local branch of