[Noisebridge-discuss] Version control

[Asheesh Laroia]

On Sat, 31 Jan 2009, John Magolske wrote:

> * Asheesh Laroia <noisebridge at asheesh.org> [090131 10:17]:
>> I could give a version control presentation + hands-on tutorial in the 
>> next couple of weeks. Would people be interested in that?
>
> Yes! I'm particularly interested in the way you version email with git. 
> IIRC, you mentioned this being an alternative to using something like 
> offlineimap to synchronize email between multiple machines.

Indeed. Although I do sometimes have to fix conflicts....

I'm planning to write a custom merge conflict resolver in the vein of the 
abandonware (I think) http://www.hawaga.org.uk/ben/tech/hgm/.

-- Asheesh.

-- 
The lunatic, the lover, and the poet,
Are of imagination all compact...
 		-- Wm. Shakespeare, "A Midsummer Night's Dream"