Highlighted
New Member.
414 views

GIT merge conflicts with UFT TSR File -Latest changes are overriding existing files instead merging

Hi there, we started using GIT with our UFT projects and facing merge issues. Looking for someone who advice in resolving the conflicts.

Latest changes are getting override existing files instead merging the changes.  Can someone advise why is this happening ?

 

 

0 Likes
3 Replies
Highlighted
Micro Focus Expert
Micro Focus Expert

hi,

the TSR file is a binary file instead of a text. Merging is not possible for binary as far as i understand. Then a newer version has to overwrite the older version.

Thanks.

James

0 Likes
Highlighted
New Member.

Thanks James. Could you suggest a way to deal with TSR file i.e. Binary files in GIT ?

0 Likes
Highlighted
Visitor.

When .tsr conflict occurs, choose to resolve the conflict.

3 new files will be created:

LOCAL – this is file from the current branch

BASE – common ancestor, how file looked before both changes

REMOTE – file you are merging into your branch

In UFT, open 'Object Repository Manager'. In 'Object Repository Manager' open 'Object Repository Merge Tool' (Tools > Object Repository Merge Tool...)

'New Merge' dialog will appear. Select LOCAL (as Primary) and REMOTE (as Secondary) files.

These 2 files appear on the right side. Final (MERGE) file is shown on the left side. Conflicts are marked and you can navigate thru them.

Choose in Resolution Options what to merge.

When completed, save your final .tsr file with its original name. In Git, mark conflict as Resolved and commit/push changes.

0 Likes
The opinions expressed above are the personal opinions of the authors, not of Micro Focus. By using this site, you accept the Terms of Use and Rules of Participation. Certain versions of content ("Material") accessible here may contain branding from Hewlett-Packard Company (now HP Inc.) and Hewlett Packard Enterprise Company. As of September 1, 2017, the Material is now offered by Micro Focus, a separately owned and operated company. Any reference to the HP and Hewlett Packard Enterprise/HPE marks is historical in nature, and the HP and Hewlett Packard Enterprise/HPE marks are the property of their respective owners.