title: how to resolve an .hgtags conflict?
body: <p>I can't resolve this conflict to .hgtags</p>
  
  <pre><code>kd:friend-sup/ $ cat .hgtags
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; MINE
  42569bf07912cd317b9305082d980cb64b318042 106.00
  42569bf07912cd317b9305082d980cb64b318042 106.01
  45846a087b03e656fcf1f986d39c095fbae2ed9e 106.02
  45846a087b03e656fcf1f986d39c095fbae2ed9e 106.03
  c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.04
  c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.05
  c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.06
  c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.07
  ||||||| ANCESTOR
  =======
  ea8e577c2cfc6538da32c16ba4248d27768223bd raw-qf-merge--main-trunk
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; OTHER
  </code></pre>
  
  <p>I tried editing the file in various ways, removing the markers, to no avail. Ideally I want the tags from MINE and OTHER, so just remove the markers.</p>
  
  <pre><code>kd:friend-sup/ $ vi .hgtags
  </code></pre>
  
  <p>the failure:</p>
  
  <pre><code>kd:friend-sup/ $ hg resolve .hgtags
  merging .hgtags
  merging .hgtags failed!
  kd:friend-sup/ $ cat .hgtags
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; MINE
  42569bf07912cd317b9305082d980cb64b318042 106.00
  42569bf07912cd317b9305082d980cb64b318042 106.01
  45846a087b03e656fcf1f986d39c095fbae2ed9e 106.02
  45846a087b03e656fcf1f986d39c095fbae2ed9e 106.03
  c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.04
  c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.05
  c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.06
  c45c61fdfe20fa088a4418fef55ba93930d6dbe0 106.07
  ||||||| ANCESTOR
  =======
  ea8e577c2cfc6538da32c16ba4248d27768223bd raw-qf-merge--main-trunk
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; OTHER
  </code></pre>