Book a Demo
« previous next »
Pages: [1]

Author Topic: CVS conflict resolution?  (Read 2118 times)

morsor

  • EA User
  • **
  • Posts: 32
  • Karma: +0/-0
  • insert text here
    • View Profile
CVS conflict resolution?
« on: October 10, 2006, 06:31:03 am »
I am evaluating EA as a possible replacement for our current UML-modeling tool, but am having some trouble understanding the depth of the CVS integration.

CVS is up and running and set up in EA as well. I have two instances of EA having checked out the same package for edit. The first check-in goes fine and the next notices a conflict - as expected.

Is the 'CVS conflict alert' all that happens - or am I missing something? Do I have to go elsewhere to investigate and resolve the conflict or is there a built-in diff/merge- tool in EA?
Logged
Pages: [1]
« previous next »