Date: Mon, 17 Mar 2008 19:10:18 -0500> From:
martijnhoekstra(a)gmail.com> To: wikien-l(a)lists.wikimedia.org> Subject: Re: [WikiEN-l]
[WikiEn-l] Why do edit conflicts suck so much?> > Fair enough. Using an external
engine that creates diffs and is fairly> smart in merging seems indeed by far the most
sensible thing to do.> > On Mon, Mar 17, 2008 at 7:05 PM, Thomas Dalton
<thomas.dalton(a)gmail.com> wrote:> > On 17/03/2008, Thomas Dalton
<thomas.dalton(a)gmail.com> wrote:> > > > 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?> > >> > >> > > The automatic merging
isn't very good, I think that's a known issue.> > > I'm not sure how
much it's meant to be able to cope with - I'll take a> > > look at the
code.> >> > Ok, it just uses the built in merge function of the external
diff> > program. That should be able to fix any conflict that doesn't have
two> > people editing the same bit of the article. If you're getting> >
conflicts with people editing different sections, there is probably> > something
more going on. If not, then it is a bug, but not a bug with> > MediaWiki - seems
unlikely, though.> >> >> >> >
_______________________________________________> > 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> >> >
_______________________________________________> 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
_________________________________________________________________
�Ѵ������ٻ��ء���ҡ�Թ����ſ���ͧ�س��������� Photo Gallery