Hi, Tom Lane wrote:
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.
You should have said "merge" command. Every tried that? Or kdiff3? Try it, you will be surprised!
Regards Markus ---------------------------(end of broadcast)--------------------------- TIP 7: You can help support the PostgreSQL project by donating at http://www.postgresql.org/about/donate