[Digikam-devel] svn merging

[Johannes Wienke]

Hi @all,

we had some discussions about svn's ability to track different merges at 
the coding sprint. I found some interesting links on that topic. It 
seems there is at least a bit of support for that since 1.5:

http://stackoverflow.com/questions/173974/how-do-i-use-the-new-svn-merge-tracking
http://blogs.open.collab.net/svn/2008/07/subversion-merg.html

Maybe this helps someone... ;)

Johannes

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 260 bytes
Desc: OpenPGP digital signature
URL: <http://mail.kde.org/pipermail/digikam-devel/attachments/20091116/362f1e8c/attachment.sig>