[wp-hackers] Switching from SVN

[Otto]

On Thu, Dec 9, 2010 at 11:35 PM, Ankur Oberoi <aoberoi at gmail.com> wrote:
> also for somewhat larger changes, if a team of people want to work on it
> together before someone higher up looks at it and gives it time of day, all
> that is soo much easier with distributed. right now i think a larger change
> would just be shunned because its too much effort to merge properly.
>
> basically it helps the individual by making their code more current (by
> making merges easier) and the maintainer by spending less time on patches
> that need to be revised (aka bad).

Wait, how exactly are merges easier?

A conflict is a conflict. It must be resolved before it can be applied
to the central point. Having a distributed version control system
doesn't make merges magically happen properly. If two people change
the same code, then it's going to cause conflicts, period.

-Otto