Git Code conflict resolution

After the command-line git pull conflicts, manually edit the conflict file and save it, then execute the git add-u command to add the changed file, then commit and push. Specific reference to the following articles

Http://stackoverflow.com/questions/12192649/git-help-userinterfacestate-xcuserstate-warning-merge-conflict-file-still-mar

When there was a merge conflict, you must resolve it first. (Well maybe you can run git merge--abort to revert).

So the process is your open your conflicting file, you look for the conflict, resolve it (edit the conflicting lines) and then Save your file, add it (using Git add-u) and commit it.

Then you can work in a clean work directory.

By the to, a conflict probably looks like:

<<<<<<< Yours:sample.txt Conflict resolution is hard;

Let ' s go shopping.

Git makes conflict resolution easy.

Theirs:sample.txt reference:http://www.kernel.org/pub/software/scm/git/docs/git-merge.html

Git Code conflict resolution