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: merging binaries
Topic Summary:
Created On: 4-Mar-2005 12:36
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.
 4-Mar-2005 12:36
User is offline View Users Profile Print this message


Hans-Joachim Zimmer

Posts: 3
Joined: 23-Feb-2005

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.
Report this to a Moderator Report this to a Moderator
 7-Mar-2005 13:24
User is offline View Users Profile Print this message


Lutz Zollikofer

Posts: 44
Joined: 31-Jul-2003

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
Report this to a Moderator Report this to a Moderator
 22-Apr-2005 00:08
User is offline View Users Profile Print this message


James Macdonald

Posts: 14
Joined: 5-Feb-2004

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
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.