title: HG Merge: Outstanding uncommited changes
body: <p>I have a file, version.txt and other files. I changed the other files, but didn't touch version.txt.</p>
  
  <p>So, I've tried to push a commit, and saw a Remote heads error. (There is a changeset which modifies <code>versions.txt</code> file)</p>
  
  <p>I did a <code>hg pull</code>, then <code>hg update</code>.</p>
  
  <p>The error is: <code>abort: crosses branches (merge branches or use --clean to discard changes)</code></p>
  
  <p>Then I tried <code>hg merge</code>: <code>abort: outstanding uncommitted changes (use 'hg status' to list changes)</code></p>
  
  <p>But I don't undertand, why if the versions.txt isn't modified by me, why can't it just merge.</p>
  
  <p>This is something I will be doing a lot, which is, develop and merge, to keep inline with the main dev repo. How can I fix this thing?</p>
  
  <p>HG Status:</p>
  
  <pre><code>M printbox/web/printbox/controllers/ct_adm_colas.php
  M printbox/web/printbox/controllers/ct_adm_jobs.php
  M printbox/web/printbox/controllers/ct_form_configurar_cola.php
  M printbox/web/printbox/core/MY_Controller.php
  M printbox/web/printbox/css/estilos.css
  M printbox/web/printbox/js/js_tablas_colas-jobs_ajax.js
  M printbox/web/printbox/models/md_cola.php
  M printbox/web/printbox/models/md_job.php
  M printbox/web/printbox/views/vw_tabla_colas.php
  M printbox/web/printbox/views/vw_tabla_jobs.php
  A printbox/web/printbox/core/MY_Model.php
  ? .idea/.name
  ? .idea/encodings.xml
  ? .idea/misc.xml
  ? .idea/modules.xml
  ? .idea/printboxweb.iml
  ? .idea/scopes/scope_settings.xml
  ? .idea/vcs.xml
  ? .idea/workspace.xml
  </code></pre>
  
  <p>EIDT: Before and After following the suggested fix, the graph log looks like this:</p>
  
  <pre><code>o  changeset:   19:e21fa7b131b0
  |  tag:         tip
  |  parent:      17:54f59f253460
  |  user:        JCV
  |  date:        Tue Apr 22 12:33:36 2014 -0300
  |  summary:     # Modificar nombre de producto para version
  |
  | @  changeset:   18:a03eaad764cd
  |/   user:        Jorge S &lt;js@fusiondev.com.ar&gt;
  |    date:        Wed Apr 23 16:28:01 2014 -0300
  |    summary:     Eliminar método que no se utiliza.
  |
  o  changeset:   17:54f59f253460
  |  user:        Jorge S &lt;js@fusiondev.com.ar&gt;
  |  date:        Mon Apr 21 17:25:23 2014 -0300
  |  summary:     Incluir SWHelper en Printbox.php
  |
  
  
  @    changeset:   21:1698791a9310
  |\   tag:         tip
  | |  parent:      20:3bfa1251da1b
  | |  parent:      19:e21fa7b131b0
  | |  user:        Jorge S &lt;js@fusiondev.c
  | |  date:        Thu Apr 24 13:59:25 2014 -0300
  | |  summary:     Merge
  | |
  | o  changeset:   20:3bfa1251da1b
  | |  parent:      18:a03eaad764cd
  | |  user:        Jorge S &lt;js@fusiondev.c
  | |  date:        Thu Apr 24 13:57:23 2014 -0300
  | |  summary:     Commit de archivos
  | |
  o |  changeset:   19:e21fa7b131b0
  | |  parent:      17:54f59f253460
  | |  user:        JCV
  | |  date:        Tue Apr 22 12:33:36 2014 -0300
  | |  summary:     # Modificar nombre de producto 
  | |
  | o  changeset:   18:a03eaad764cd
  |/   user:        Jorge S &lt;js@fusiondev.c
  |    date:        Wed Apr 23 16:28:01 2014 -0300
  |    summary:     Eliminar método que no se utili
  |
  o  changeset:   17:54f59f253460
  |  user:        Jorge S &lt;js@fusiondev.com
  |  date:        Mon Apr 21 17:25:23 2014 -0300
  |  summary:     Incluir SWHelper en Printbox.php
  </code></pre>