Reputation: 31
If I do
p4 integrate foo/file bar/file
p4 submit
and then want to make substantially the same change to both copies in a single submit, is there a better way than just p4 editing both of them and doing the submit?
Upvotes: 0
Views: 410
Reputation: 11935
Making edits directly to both files is the wrong way to do it.
Running the p4 integrate
command is letting perforce know that there should be a relationship between the files.
You should edit just one of the files, submit it, then you should do another integrate/merge/resolve.
Upvotes: 2