![]() |
Telelogic SYNERGY (steve huntington) | ![]() |
profile :
search :
help :
dashboard :
calendar :
home
|
||
|
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 |
![]() |
![]()
|
![]() |
|
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... |
|
![]() |
|
![]() |
|
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. |
|
![]() |
|
![]() |
|
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 |
|
![]() |
Telelogic SYNERGY
» SYNERGY/CM
»
Automatic merge
|
![]() |
FuseTalk Standard Edition v3.2 - © 1999-2009 FuseTalk Inc. All rights reserved.