On Tue, Feb 7, 2017 at 12:36 PM, Stefan Sperling <stsp_at_elego.de> wrote:
> On Tue, Feb 07, 2017 at 12:25:09PM +0100, Johan Corveleyn wrote:
>> I've been looking at the table in the release notes (in my browser,
>> not the textual diff, but replying on this commit to have some context
>> -- the "kinds of versioned items" column is already gone btw).
>>
>> I think it would be easier to understand for users if we changed the
>> order of the columns, to describe it like a user encountering the tree
>> conflict would experience it (at least, the way I experience it :-),
>> which is:
>>
>> 1) What's my local situation (local change)
>> 2) What operation did I do (operation)
>> 3) What's the incoming change
>> 4) Resolution options
>>
>> The grouping between some things would then change as well.
>>
>> So that would be:
>>
>> <tr>
>> <th>local change</th>
>> <th>operation</th>
>> <th>incoming change</th>
>> <th>resolution options</th>
>> </tr>
>>
>> In the first column there would be 4 possibilities right now, if we
>> shuffle the table around: "move an item", "add an item", "any change
>> inside a directory", "edit file" (or maybe these should be set in past
>> tense "edited file", "moved item", ... , because the user did them
>> already?). BTW: this makes me wonder, why no "deleted an item" for
>> local change?
>>
>> I'm willing to do this shuffling if we agree, and if noone else does
>> it first :-).
>
> Yes, this makes sense.
> Please just go ahead. I'd be happy to see you make any edits you wish to make.
> Let me know when you're done and I'll take a look at the result.
>
> The visual representation of this table is important, so having something
> to look at is better than discussing abstract ideas, I think :)
Ok, I'll give it a go tonight.
BTW: why no "deleted an item" for local change (can't look at the code
/ resolver options right now myself, so just wondering ...)?
--
Johan
Received on 2017-02-07 12:40:46 CET