| Message view | « Date » · « Thread » |
|---|---|
| Top | « Date » · « Thread » |
| From | Benjamin Fritz <fritzophre...@gmail.com> |
| Subject | Re: Directory with tree conflict lies about merge result |
| Date | Wed, 06 Aug 2014 18:03:18 GMT |
On Wed, Aug 6, 2014 at 1:00 PM, Stefan Sperling <stsp@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. | |
| Mime |
|
| View raw message | |