Jump to content


mob

Member Since 20 Feb 2019
Offline Last Active Apr 23 2020 11:02 AM
-----

Posts I've Made

In Topic: tampered warning on resolve

27 September 2019 - 09:51 AM

Again some question about "tampered warning on resolve"...
Because the common Base was quite old and p4merge 4 window-view was too complex, we just edit the file in some external diff editor. p4 resolve -am was failing because P4 detected the tampered file. Ok.
What is the right way to submit that file as integrated? p4 edit, then p4 resolve again? Or would 'p4 edit' submit a simple edited file and forget about the integration?