[issue3105] Defang 'hg resolve'

[Gregg Lind]

New submission from Gregg Lind <gregg.lind at gmail.com>:

I didn't see any actual bugs / action plan based on the discussion at
http://mercurial.808500.n3.nabble.com/Painful-user-experience-with-hg-resolve-td3285000.html
. 

Me:

* newish hg user
* coming from git
* with internal:merge (conflict markers)

After I 'fix' my conflicts, 'hg resolve' (no args) *undoes the work*.  This
is very pointy!  It's more like 'hg antiresolve' :)  

Solutions (from the thread)

* more documentation (boo!)
* moving resolve (no args) to 'remerge'
* checking for hashes during the merge, or otherwise looking for conflict
markers or something (seems brittle)

----------
messages: 18089
nosy: gregglind
priority: bug
status: unread
title: Defang 'hg resolve'

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue3105>
____________________________________________________