4 Jul
2014
4 Jul
'14
10:57 a.m.
I like the idea 2.
2014-07-03 11:16 GMT+02:00 Thomas Mortagne <thomas.mortagne(a)xwiki.com>om>:
On Thu, Jul 3, 2014 at 11:11 AM, vincent(a)massol.net
<vincent(a)massol.net>
wrote:
selected
conflict options because otherwise the user to know the algorithm
and compute it in his head by checking the previous value, the changes done
to the page and the new values and that’s not easy at all.
By default you get a diff between what you curently have and what you
will get if you click continue, I don't see how this require the user
"to know the algorithm and compute it in his head".
the user
will not have to resolve too many conflicts when upgrading…
Hi Thomas,
On 3 Jul 2014 at 11:02:42, Thomas Mortagne (thomas.mortagne(a)xwiki.com
(mailto:thomas.mortagne@xwiki.com)) wrote:
Hi devs,
from time to time we get a proposed merge which is not very accurate
in a conflict for a single line field which can sometime be quite a
pain when that content is velocity like in document titles. Many users
just clic "continue" button without looking at the conflict and end up
with a bad title.
Actually what would help a lot is a preview of what you’d get with the By default we pretty much have two choices for
single line fields:
1/ continue trying to do a 3 ways merge
2/ do not do any 3 ways merge (or see it as a line based merge which
pretty much mean the same thing). Like at any level merge default on
current in case of conflict so the proposed merge for this field would
be to do nothing basically
WDYT ?
1/ support simple use case without displaying an annoying conflict UI
but it also means being almost sure to have bad title in more complex
use cases if you just click continue
I guess 2/ is a bit safer.
I prefer to be on the safe side with 2 (line-based merge), hoping that
It would be interesting to try out an upgrade, from some existing real
life
version (from xwiki.org or myxwiki.org for ex) to a new XWiki
version having 2/ implemented and see how many more conflicts would be
generated.
Thanks
-Vincent
_______________________________________________
devs mailing list
devs(a)xwiki.org
http://lists.xwiki.org/mailman/listinfo/devs
--
Thomas Mortagne
_______________________________________________
devs mailing list
devs(a)xwiki.org
http://lists.xwiki.org/mailman/listinfo/devs