Book a Demo

Author Topic: managing a merge (version control)  (Read 3224 times)

gpc

  • EA User
  • **
  • Posts: 111
  • Karma: +0/-0
    • View Profile
managing a merge (version control)
« on: October 24, 2007, 02:52:14 am »
Hi,
EA has a really cool feature, whereby you can see the differences between what the project contains and what is held on disk, but there doesn't seem any way to import these changes? (without losing my own).

peter.zrnko

  • EA User
  • **
  • Posts: 253
  • Karma: +0/-0
    • View Profile
Re: managing a merge (version control)
« Reply #1 on: October 24, 2007, 10:24:28 pm »
Have you tried "Get latest" and "Get all latest"?
These are available only for private models (this setting is in Version Control Settings).


Sorry, this response had to go to other thread.
« Last Edit: October 25, 2007, 09:28:28 pm by peter.zrnko »
Peter

gpc

  • EA User
  • **
  • Posts: 111
  • Karma: +0/-0
    • View Profile
Re: managing a merge (version control)
« Reply #2 on: October 25, 2007, 12:35:33 am »
Get latest will overwrite my changes I believe. As EA can identify the differences it would be nice if they could be imported in on an individual basis - i.e. a merge rather than an overwrite.

peter.zrnko

  • EA User
  • **
  • Posts: 253
  • Karma: +0/-0
    • View Profile
Re: managing a merge (version control)
« Reply #3 on: October 25, 2007, 09:35:08 pm »
You are right. There is nearly no possibility to merge packages.

The only possibility to synchronize projects is when using replications. But as I know, people usually prefer other way of sharing projects (and version control it).
Peter