Steps to commit in Mercurial


  1. Commit locally

  2. Pull - if no changes skip to step 6

  3. In terminal use command "hg update <default>"

  4. In terminal use command "hg merge <default>" - if successful skip to step 6

  5. Commit merged classes

  6. Push