Re: [CODE4LIB] Using Git/diff3 to update local copies of files

2015-07-23 Thread Peter Murray
Thanks, Demian! Nice technique and nicely documented. Peter > On Jul 23, 2015, at 1:51 PM, Demian Katz wrote: > > Hello, > > I've just solved a problem that has been bothering me for several years, and > I thought I would share it with this group in case anyone else finds it > helpful. >

[CODE4LIB] Using Git/diff3 to update local copies of files

2015-07-23 Thread Demian Katz
Hello, I've just solved a problem that has been bothering me for several years, and I thought I would share it with this group in case anyone else finds it helpful. There are several software packages out there that encourage you to implement customizations by copying files out of the "core" in