Re: Directory with tree conflict lies about merge result

On Wed, Aug 6, 2014 at 1:00 PM, Stefan Sperling <stsp_at_elego.de> wrote:
> The server keeps sending adds for the paths.
> It has no idea the client cannot use them.
>
> Note how the As you're asking about appear in the tree-conflict column,
> not in the first column as normal adds do. They allow you to see what
> the server wants to add beneath its version of 'host'.

I get it now! Thanks for the clarification.
Received on 2014-08-06 20:04:09 CEST