Resolving conflicts

    Table of contents
    No headers

    Important point, that. Suppose you have edited some files in your local repository which you have subsequently committed. Now you type

    git pull

    to merge the latest and greatest changes from your buddies into your repository, and before you know it, KABOOM, conflicts. Resolving this works much like CVS, you start by editing the file[s], fix the conflict areas denoted by <<< === >>> in each of the files. Then you

    git add file[s]

    strange as it may seem, this is necessary to reinforce your "correct" version as the official one. Now you can (simply)

    git commit file[s]

    git push

    And now your tree is in sync with the original tree again. Note that there are a lot of other advanced merging commands. Maybe a real expert can try to explain these for us mere mortals.



    Page last modified 19:42, 17 Jun 2009 by lindahl