[Glass] git merge driver for FileTree

[Dale Henrichs]

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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.gemtalksystems.com/mailman/private/glass/attachments/20140507/f4cdd2ec/attachment.html>