Re: Updated Issue 209 - support drop/modified conflict (monotone)

Markus Wanner <[email protected]>
Newsgroups gmane.comp.version-control.monotone.devel
Message-ID <[email protected]> 
On 06/19/2012 08:47 AM, [email protected] wrote:
> Comments (last first):
> 
> # By Stephen Leake, Jun 19, 2012:
> 
> One way to support that use case, and similar ones, is to provide a 'mtn:resolve_conflict' attribute, to specify the 'drop' resolution for this case. Work on this is being done in branch nvm.issue-209.file_attribute.

Cool, thanks.

Markus Wanner
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.