Yes, I still use svn and yes perhaps I should try that Git thing people keep talking about. But anyway.

Since this post is for my pleasure and my pleasure only I will post a little something to remind me how to solve those tree conflicts. Because I keep forgetting how to do it.

First of all I get a message on commit saying there is a tree conflict.

Than we do an update and forget to take a printscreen.

Than we do a resolved thing.

Than we do the commit again.

Easy as pie.