Changes between Version 1 and Version 2 of remote/mercurial


Ignore:
Timestamp:
Nov 25, 2014 5:03:43 PM (7 years ago)
Author:
vegasm
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • remote/mercurial

    v1 v2  
    1616hg help config #Shows help tips
    1717
     18hg pull #Downloads files and udpates the local repository
     19
     20}}}
     21
     22=== How To update from the Remote repository ===
     23
     24{{{
     25   hg pull  #pull changesets from the Remote repository to the local one but does not merge
     26   hg update #updates the local repository ignoring modified files to merge
     27   hg merge #If there are no conflicts, it will inform about files updated, merged, removed...
    1828}}}
    1929
     
    3141}}}
    3242
     43=== merge conflicts ===
     44Sometimes when you are working with your local copy, some conflicts may appear. To solve the "outstanding uncommitted merges" when you try to merge the local repo, execute the following in the command line.
     45
     46{{{
     47   hg update --clean -r tip
     48   hg merge #Now you must see no errors.
     49}}}
    3350
    3451== Links ==