Welcome to Telelogic Product Support
  Home Downloads Knowledgebase Case Tracking Licensing Help Telelogic Passport
Telelogic SYNERGY (steve huntington)
Decrease font size
Increase font size
Topic Title: Automatic merge
Topic Summary: Is Synergy/CM capable of performing automatic merges
Created On: 31-Jan-2006 13:15
Status: Read Only
Linear : Threading : Single : Branch
Search Topic Search Topic
Topic Tools Topic Tools
Subscribe to this topic Subscribe to this topic
E-mail this topic to someone. E-mail this topic
Bookmark this topic Bookmark this topic
View similar topics View similar topics
View topic in raw text format. Print this topic.
 31-Jan-2006 13:15
User is offline View Users Profile Print this message


Mattias Mohlin

Posts: 6
Joined: 24-Jan-2006

When Synergy/CM (Java GUI) detects a parallel version of a file when a task is being completed, it offers the possibility to do a merge. Doing so brings up a nice graphical merge tool.
But very often there are no conflicts, i.e. merging is trivial, and all I have to do is to press the Save button.
Most other CM tools I have used can perform automatic merges, that is the tool performs the merge automatically when needed and only notifies me when conflicts are detected.
Does anyone know if Synergy/CM is capable of performing automatic merges?

When I have hundreds of files to merge it is not practical to bring up the Merge tool for each and every file...
Report this to a Moderator Report this to a Moderator
 3-Feb-2006 16:35
User is offline View Users Profile Print this message


David Dubreu

Posts: 43
Joined: 21-Aug-2003

Hi,

"Does anyone know if Synergy/CM is capable of performing automatic merges?"

-> Yes, with the standard interface. I dont know the JAVA GUI.

David.
Report this to a Moderator Report this to a Moderator
 11-Oct-2006 15:57
User is offline View Users Profile Print this message


Brent Hetland

Posts: 2
Joined: 29-Aug-2006

Hi David (or anyone),

Could you elaborate on your answer please?  I am using the Standard/CM 6.4 UI and when I check-out, change, and check-in (or complete the task) parallel versions of a file, I am prompted to do a merge using the merge tool, just at Mattias mentions, even if there are no conflicting code changes.

You say that the standard interface will do this.  How?

Mattias' question, and now mine as well, is:  Can Synergy do the merge for us, without prompting us, and without requiring that we open the merge tool and save the changes.  It is this user interaction that is a killer, when alot of parallel versions of files are involved.  If I change line 1 of a file and you change line 100 of a parallel version of that file, and we both check in our files, I want Synergy to do the merge and combine our changes without any human interaction.

I don't see a way of changing Synergy's default behavior.  It would be nice if there were a "Automatically Perform Nonconflicting Merges", but I don't see such a setting anywhere.

Thanks in Advance,
Brent

Edited: 13-Oct-2006 at 15:42 by Brent Hetland
Report this to a Moderator Report this to a Moderator
Statistics
20925 users are registered to the Telelogic SYNERGY forum.
There are currently 1 users logged in.
The most users ever online was 15 on 15-Jan-2009 at 15:34.
There are currently 0 guests browsing this forum, which makes a total of 1 users using this forum.
You have posted 0 messages to this forum. 0 overall.

FuseTalk Standard Edition v3.2 - © 1999-2009 FuseTalk Inc. All rights reserved.