On Wed, 2013-04-17 at 09:27 -0500, Rafael Vega wrote:
Can anyone provide tips on how to diff two pd patches to find differences quickly so that conflicts can be fixed by hand without spending too much time trying to find differences?
I think there is no way to sanely handle that. I treat .pd files as binary files in this regard. One small change can change the whole file. The objects within a patch are identified and ordered by an automatically given integer number. A small change might cause many objects to be renumbered without any relation to the previous version. Such a diff might be huge even if the change is very small.
I think you are left with avoiding conflicts whenever possible as Pd patches cannot be diff'd and merged in a meaningful way.
Roman