It would be cool if it only showed, say, the surrounding two sections to fix
problems with section changing/adding etc. And, even if the content can't be
cleanly merged, maybe they can be displayed in the same edit box with
comment
tags on each end of your edit?
Nathan
On 3/17/08, Thomas Dalton <thomas.dalton(a)gmail.com> wrote:
On 17/03/2008, Martijn Hoekstra <martijnhoekstra(a)gmail.com> wrote:
Because that I know of there is no current way to
determine if an edit
conflict is in different sections, and can be auto-merged. I would
like to see an automerge feature sometime in the future, where a
proposed merge is displayed. It would solve a lot of problems, even
for a very conservative algorithm that only suggests a merge when the
edits are done to different sections. It still would only have to load
the specific section again to make the changes. I don't know how hard
this would be though, but it doesn't sound too hard to me.
Conflicts are already merged automatically where possible - a more
advanced system of working out how to merge (possibly involving asking
the user to check it) would be great, but the very conservative
algorithm you suggest does already exist.
_______________________________________________
WikiEN-l mailing list
WikiEN-l(a)lists.wikimedia.org
To unsubscribe from this mailing list, visit:
https://lists.wikimedia.org/mailman/listinfo/wikien-l