monotone-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict


From: Hendrik Boom
Subject: Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict
Date: Thu, 14 Jun 2012 12:06:42 -0400
User-agent: Mutt/1.5.20 (2009-06-14)

On Thu, Jun 14, 2012 at 08:06:42AM -0400, Stephen Leake wrote:
> Ethan Blanton <address@hidden> writes:
> 
> >> An alternate is to live with the 'ignoring upstream changes due to local
> >> delete' warning in 1.0.
> >> 
> >> Why is that not ok?

How would monotone know which is upstream and which is downstream?

-- hendrik



reply via email to

[Prev in Thread] Current Thread [Next in Thread]