Alvaro Herrera <alvherre@commandprompt.com> writes:
> Yes, it's nice. Consider this: Andrew develops some changes to PL/perl
> in his branch. Neil doesn't like something in those changes, so he
> commits a fix there. In the meantime, Tom has been busy with his own
> stuff and committing to the main branch; Andrew can track those changes
> by propagating from the main branch to his branch -- he doesn't need to
> fall behind and update his modified tree once a month and deal with
> umpteen conflicts.
Yah know, the one bit of these pitches that always sounds like pure
snake oil is the claim that they offer some kind of mechanical solution
to merge conflicts. AFAICS that has nothing to do with the SCMS in use
and everything to do with whether your "diff" command is AI-complete.
I note also that CVS does have the ability to merge changes across
branches, we just choose not to use it that way.
regards, tom lane
