[issue2046] resolve should not overwrite local changes without confirmation
Sean
bugs at mercurial.selenic.com
Tue Feb 16 20:25:40 UTC 2010
New submission from Sean <sean at caustic.com>:
If the user has made changes to conflicted files after a merge, running "hg
resolve" should not overwrite those changes without any confirmation. The
user probably just forgot to run "hg resolve -m".
----------
messages: 11778
nosy: seangies
priority: bug
status: unread
title: resolve should not overwrite local changes without confirmation
topic: merge
____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2046>
____________________________________________________
More information about the Mercurial-devel
mailing list