Heya all!
I posted a solution to the diff problem in the ni.com discussion forum. you can find it here:
http://forums.ni.com/t5/LabVIEW/LabVIEW-with-Git/td-p/1047455/page/3
Merging seems to work fine with me, just by following the google doc that Ton Plomp suggested.
Hope you find it useful
Share what you know, learn what you can.
Knowledge is the only matter that grows when shared.
If you want to go quickly, go alone. If you want to go far, go together.
These are fairly know and I like then a lot.
I've been trying to modify them slightly to relate them to LV or LAVA or NI, but I could come up with anything nice, maybe someone will be more creative than me :-o
The International Association for the Advancement of LabVIEW Development
LAVA - Where new ideas in LabVIEW flow freely...
Most Awesome Graphical Magical Algorithms (MAGMA)
Very original LabVIEW concepts about neat objects (VOLCANO)
Highly evangelical algorithm topics (HEAT)
Topics enhancing concepts to optimize National Instruments code (TECTONIC)
ok, some of those are pretty bad...