Stories
Slash Boxes
Comments

NOTE: use Perl; is on undef hiatus. You can read content, but you can't post it. More info will be forthcoming forthcomingly.

use Perl

All the Perl that's Practical to Extract and Report

The results of thinking about merging More | Login | Reply

The Fine Print: The following comments are owned by whoever posted them. We are not responsible for them in any way.

Without JavaScript enabled, you might want to use the classic discussion system instead. If you login, you can remember this preference.

Just use an external tool (Score:4, Interesting)

by rafael (2125) <reversethis-{moc ... {zerausaicragr}> on 2003.07.31 9:28 (#22614) Homepage Journal

diff3 ! (in GNU diffutils)

Reply to This
If you are serious about this... (Score:2, Interesting)

by melopt (2533)

... then please include metadata that makes it easier to merge diferent branches. the system should tag the merge point's and remmember the last merge between branches. That would make easier multiple merges. Changeset's might make it easier also... But, I didn't think about those in detail.

--
life is too short

Get More Comments

Stories, comments, journals, and other submissions on use Perl; are Copyright 1998-2006, their respective owners.