[Adium-devl] Merging how-to

[Peter Hosey]

 From the log from today's meeting (sorry for missing it, BTW):
> Jul 13 04:06:38 <The_Tick>	durin42: can you write this out on a  
> wiki page once you figure it out
> Jul 13 04:06:49 <The_Tick>	a commit policy so to speak
> Jul 13 04:06:52 <durin42>	The_Tick: yeah, I'll write a merging howto

I've already written one:

	<http://boredzo.org/blog/archives/2006-10-29/how-to-use-svn-merge>

-------------- next part --------------
A non-text attachment was scrubbed...
Name: PGP.sig
Type: application/pgp-signature
Size: 186 bytes
Desc: This is a digitally signed message part
URL: <http://adium.im/pipermail/devel_adium.im/attachments/20070713/bacf579b/attachment.sig>