[WikiEN-l] [WikiEn-l] Why do edit conflicts suck so much?

[Martijn Hoekstra]

On Mon, Mar 17, 2008 at 6:25 PM, Thomas Dalton <thomas.dalton at gmail.com> wrote:
> On 17/03/2008, Martijn Hoekstra <martijnhoekstra at 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 at lists.wikimedia.org
>  To unsubscribe from this mailing list, visit:
>  https://lists.wikimedia.org/mailman/listinfo/wikien-l
>

Hm, I could have sworn I've been in such edit conflicts on ANI. If it
happens again, should I file a bugreport on that?