ROBOMERGE

Stomping Changes

What's Stomp Changes?

When a conflict consists of only binary files, Robomerge will offer to 'stomp' those binary files in the target path () with the revisions in the source path (). If your conflict consists of more than just binary files, Robomerge will not be able to provide this functionality.

Once your stomp request is verified and you elect to use stomp, you should receive an email when the process is complete.

Please report any issues to #dt-robomerge-help-ext on Slack.

Stomp Verification May Have Encountered Issues.

Conflicts found in text files

Robomerge found conflicts in text files from changelist integrating into .

Since there are outstanding conflicts to text files, we cannot move forward with stomp. Here are the unresolved text files:

If you still require assistance, please Contact Us for Robomerge help.

Stomp Could Not Calculate Stomped Revisions For Some/All Files

Robomerge could not calculate stomped revisions for some files while merging to :

This can happen when these files have complex integration paths where it is too hard to determine which changes will actually be stomped between two branches/streams.

In this case, Robomerge cannot tell you what changes will be affected for the above files, nor will it be able to alert the affected authors for those changes.

If you still wish to proceed, you will be responsible for reviewing the history of the above files in P4V and alert the authors of any changes you'll be overwriting.

If you require assistance, please Contact Us for Robomerge help.

Text files will be integrated alongside binary files.

Robomerge has detected changes to text files that were automatically resolved during the integration into .

In the case of code or configuration files, they may have relied on the binary changes that will be stomped. Please take a moment to ensure this is a valid request by reviewing the merged files:

Stomp Did Not Calculate Stomped Revisions For Some/All Files

Robomerge skipped calculating stomped revisions for some files while merging to :

Robomerge does this for certain files where it isn't feasible to accurately determine which changes will actually be stomped (such as merge targets in tasks streams [//Tasks/]). If you are concerned with what changes are being stomped if you were to proceed, please review the history of those files in P4V.

If you still require assistance, please Contact Us for Robomerge help.

Stomp Request Processed.

Robomerge will run the merge for the changelist again and stomp the binary file conflicts. You should receive an email when this process is complete.

If you do not receive an email, please Contact Us for Robomerge help.

Stomping Changes

Verifying Stomp Request...

Stomp Verification May Have Encountered Issues.

Stomp Request Processed.