At 10:05 AM 11/27/2002 +0000, Hardy, Andrew wrote:
I should have branched and submit immediately so that #1 was just a copy.
Then, edit, make changes and submit to get #2. Finally merge #2 back into
main.
I tried this with a new branch and it merged as required, but I'm not quite
sure why!
You can aways make it work with 'p4 integ -f'.
If 'best practice' is to branch and submit, why isn't this
enforced?
Because in the general case, p4 integrate/p4 resolve/p4 submit, it is expected
that there will be differences due to conflict resolution. It would be a
challenge
for Perforce to detect which modifications are needed for a proper merge and
which are "cheats" that add new chnges.
2 messages in com.perforce.perforce-user[p4] RE: Problems integrating after a...