[PD] Git version control, diff and pd.

[Rafael Vega]

Hello.

We're three developers trying to use git version control for a project that
includes a handful of relatively complex pd patches and a bunch of
text-based source files (c++ and html). A problem arises when git tries to
merge one of the pd patches with another version of it: It fails and gives
you a .pd file full of conflict markers that confuse the pd file parser.

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?

Thanks!

-- 
Rafael Vega
email.rafa at gmail.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.puredata.info/pipermail/pd-list/attachments/20130417/aa262c3b/attachment.htm>