Hi Thomas, On 3 Jul 2014 at 11:02:42, Thomas Mortagne ([email protected](mailto:[email protected])) 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 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 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 the user will not have to resolve too many conflicts when upgrading… 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 [email protected] http://lists.xwiki.org/mailman/listinfo/devs
