flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Justin Mclean <jus...@classsoftware.com>
Subject Re: Merging 4.9.1 release bench into develop
Date Tue, 16 Apr 2013 06:49:54 GMT

>> Did you use MergeTool?  I'm thinking of downloading it and trying it out.
It may help a little but not a lot for simple changes as you still have to resolve the conflicts.

It's certainly not quite as smart as SVN re conflicts but I guess it can't be because of t's
distributed nature. 

Most of the conflicts I saw would not of been conflicts under SVN including files that were
in conflict but had 100% identical content.

View raw message