![]() |
Telelogic SYNERGY (steve huntington) | ![]() |
profile :
search :
help :
dashboard :
calendar :
home
|
||
|
Topic Title: merging binaries Topic Summary: Created On: 4-Mar-2005 12:36 Status: Read Only |
Linear : Threading : Single : Branch |
![]() |
![]()
|
![]() |
|
we have checked in binary files (ms word a.s.o) which are parrallel because of branches.
Did anybody know how to "merge" it together, meaning logical merge and replace the merge result with the wanted version.
Thanks a lot.
|
|
![]() |
|
![]() |
|
Hi Hans-Joachim,
for this you've to customize the merge/diff option, like described in TB178. For other none ascii types proceed in the same matter. ciao, Lutz |
|
![]() |
|
![]() |
|
This is how we merge binaries.
Firstly you obviously can't really merge them so create a task, check out one of the binaries, then as ccm_admin (maybe even build_mgr, cant remember), create a link from the other one to the new working version from the history view. Check in. It's simple and seems to work fine. Jim Edited: 22-Apr-2005 at 00:09 by James Macdonald |
|
![]() |
Telelogic SYNERGY
» SYNERGY/CM
»
merging binaries
|
![]() |
FuseTalk Standard Edition v3.2 - © 1999-2009 FuseTalk Inc. All rights reserved.