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?
mobMember Since 20 Feb 2019
Offline Last Active Jan 09 2020 12:36 PM
- Group Members
- Active Posts 8
- Profile Views 470
- Member Title Newbie
- Age Age Unknown
- Birthday Birthday Unknown
mob hasn't added any friends yet.
09 Jan 2020 - 17:17