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

[Thomas Dalton]

On 17/03/2008, Ian Woollard <ian.woollard at gmail.com> wrote:
> On 17/03/2008, Thomas Dalton <thomas.dalton at gmail.com> wrote:
>  > 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.
>
>
> In my experience, as these things go, it's not too bad.

In my experience, too. Apparently not in Martijn's though.