[Glass] git merge driver for FileTree

[Johan Brichau]

aaaahhhh ...  :-)

thanks Dale!
Johan

On 08 May 2014, at 17:10, Dale Henrichs <dale.henrichs at gemtalksystems.com> wrote:

> Johan,
> 
> You can put a .gitattributes file in the repository directory that looks like this:
> 
> *.package/monticello.meta/version        merge=mcVersion
> *.package/*.class/methodProperties.json      merge=mcMethodProperties
> *.package/*.class/properties.json        merge=mcProperties
> 
> Dale
> 
> 
> On Thu, May 8, 2014 at 8:01 AM, Johan Brichau <johan at yesplan.be> wrote:
> This looks great indeed.
> 
> I added the config file but do I understand correctly that I need to add a .gitattributes file myself to each package?
> 
> Johan
> 
> On 07 May 2014, at 17:21, Dale Henrichs <dale.henrichs at gemtalksystems.com> wrote:
> 
> > BTW, the issue with the methodProperties file was pilot error ... I fat-fingered the entries in my .gitconfig file ...
> >
> > If you are using FileTree, you need to use Thierry's merge driver.
> >
> > Dale
> >
> >
> > On Wed, May 7, 2014 at 8:08 AM, Dale Henrichs <dale.henrichs at gemtalksystems.com> wrote:
> > Thierry Goubier has created a git merge driver for FileTree that takes the pain out of manually dealing with moniticello.meta/version files!
> >
> > The driver is written in Smalltalk using Pharo3.0. His (very complete) readme assumes that you've installed Pharo3.0 using the instructions at get.pharo.org.
> >
> > What's cool is that he arranges to correctly splice the merged version history into the version file, automatically during the merge.
> >
> > I had an issue with the merge driver for a methodProperties file, but just having automatic merges for the version file is great ...
> >
> > Dale
> >
> > [1] https://github.com/ThierryGoubier/GitFileTree-MergeDriver
> >
> > _______________________________________________
> > Glass mailing list
> > Glass at lists.gemtalksystems.com
> > http://lists.gemtalksystems.com/mailman/listinfo/glass
> 
>