Differences

This shows you the differences between two versions of the page.

--- tools:development [2013/04/02 07:27] – created skipidar
+++ tools:development [2023/11/01 07:13] (current) – ↷ Page moved from business_process_management:camunda:tools:development to tools:development skipidar
@@ Line 1: / Line 1: @@
+=== SVN ===
+For sync and merge - use [[http://tortoisesvn.tigris.org/|TortoiseSVN]] and [[http://www.perforce.com/downloads/Perforce-Software-Version-Management/complete_list/Free%2020-User%20Edition#10|P4Merge]] as external merge viewer.
+How to integrate P4Merge into TortoiseSVN: http://1024strongoxen.blogspot.de/2011/08/three-way-merging-made-painless-with.html
+<code>
+Add in the External Programs / Diff Viewer the path with these args:
+C:\Program Files\Perforce\p4merge.exe %base %mine
+And in the Merge Tool section:
+C:\Program Files\Perforce\p4merge.exe %base %theirs %mine %merged
+</code>