Book a Demo

Author Topic: SVN conflicts resolving  (Read 3139 times)

Cymrak

  • EA Novice
  • *
  • Posts: 4
  • Karma: +0/-0
    • View Profile
SVN conflicts resolving
« on: May 28, 2010, 11:34:14 pm »
Hello. I use Subversion. How can i resolve (merge) conflict of Enterprise Architect document.
My SVN client is TortoiseSVN
« Last Edit: May 28, 2010, 11:35:46 pm by Cymrak »

pH

  • EA User
  • **
  • Posts: 72
  • Karma: +0/-0
    • View Profile
Re: SVN conflicts resolving
« Reply #1 on: May 31, 2010, 07:31:40 pm »
I dont think it is possible to resolve conflicts for xmi files.

-pH
<a href="http://webuml.org"><img src="http://webuml.org/images/webuml-badge.png" alt="Set UML Free!" style="border-width:0"></a>