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