On Wed, Jan 25, 2017 at 3:41 PM, <s...@apache.org> wrote:
> Author: stsp
> Date: Wed Jan 25 14:41:03 2017
> New Revision: 1780191
>
> URL: http://svn.apache.org/viewvc?rev=1780191&view=rev
> Log:
> * release-notes/1.10.html: Add a section about the new conflict resolver.
...
> +<table border="1">
> + <tr>
> + <th>operation</th>
> + <th>incoming change</th>
> + <th>local change</th>
> + <th>kinds of versioned items</th>
> + <th>resolution options</th>
> + </tr>
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 :-).
--
Johan
