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
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
On 17/04/13 16:54, Roman Haefeli 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.
wasn't there some plan to
Hi Rafa,
+1 on what Roman said.
We use Pure Data and Git a lot in our projects and you might find you have
more luck organising a useable workflow in your team rather than trying to
automatically diff/merge patches.
Here's some of the things we do:
- Split up your code into abstractions
Thanks for the replies, that's what I feared :)
Joe, I like your suggestions about abstractions and $0, thanks!
On Wed, Apr 17, 2013 at 10:34 AM, Joe White white.j...@gmail.com wrote:
Hi Rafa,
+1 on what Roman said.
We use Pure Data and Git a lot in our projects and you might find you
