![]() |
Telelogic SYNERGY (steve huntington) | ![]() |
Topic Title: Forcing conflict resolutino during update Topic Summary: Created On: 7-Oct-2008 15:33 Status: Read Only |
Linear : Threading : Single : Branch |
![]() |
![]()
|
![]() |
|
Hello,
We are using the Synergy command lines for our overnight compilation. The batch intentionally changes the dlls and exe file versions, so that it is easier for us to maintain. However, the update command fails when the manually modified files are eventually updated by another developer because conflicts are detected. I was able to set the reconf_stop_on_fail to false so that it would continue the update process, but those files are never replaced. We are using a remote connection so it can take several hours to resolve all the conflicts automatically using the reconcile command. In this case, I know that the conflict is normal and would like to know if there was a way to force the update to Get the new file wether there's a conflict or not through in the same update process, rather than having to do a complete reconcile (and forcing to update work area from the database). Frederic |
|
![]() |
Telelogic SYNERGY
» SYNERGY/CM
»
Forcing conflict resolutino during update
|
![]() |
FuseTalk Standard Edition v3.2 - © 1999-2009 FuseTalk Inc. All rights reserved.