Avi Bryant wrote:
On Jan 27, 2006, at 6:59 PM, Diego Fernandez wrote:
<snip lots of valid criticism>
- I really miss the three way diff :) (we have done an special
version that shows with colors those methods that can be merged without conflicts: the ancestor and the current version are the same)
This confuses me, because Monticello is almost entirely built around being able to do a three way diff - I can't imagine a process where multiple people were using Monticello and *not* constantly doing three way diffs, including good conflict detection (more accurate than is possible with ENVY, which doesn't model branches very well). So - do you use the Merge button? What do you miss from it?
Avi
Just to throw in my $0.02, there's only one mention of the Merge button in the MC documentation (that I've found anyway) under the section 'Getting Started' http://www.wiresong.ca/Monticello/UserManual/GettingStarted/, and that itself says just effectively "click merge" rather than describing what happens. It also (scarily imo) says it only merges non-conflicting changes, but doesn't mention how (if?) conflicts are dealt with. Perhaps that's why people perception of MC's merge support isn't great from the start? This isn't a comment on MC's *actual* merge capability, more its *perceived* capability :) S
This message has been scanned for viruses by BlackSpider MailControl - www.blackspider.com