I am using the Perforce P4V client (version 2013.1 / 611291 dated March 20, 2013).
I tried to combine / integrate from the main branch into my function branch. It has been a long time since I did this, so a significant number of files have been added to the change list. Then I resolved conflicting files that could not be automatically merged. Then I sent a list of changes. After that, I found that some files remained in a disordered, conflicting state. That is why it is a mystery to me, but instead of trying to fix them, I thought it would be easier to just completely unite the integration / integration and start over.
To cancel the merge / integration, I used the back option. All affected files were added to the back change list, and I sent it. My function branch has now returned to where it needed to start, except, obviously, by that time all the affected files had a double revision number, and the history for the affected files shows integration, and then the subsequent "reverse".
The problem is that if I try the Merge / Integrate option again, this time around the number of files that Perforce wants to make a list of changes, it is now part of the ones he originally tried to integrate. In other words, this is not the addition of a large number of files, which I know are most definitely advanced in terms of development in the main industry.
, , , , - Force integration on all revisions, disregarding revision history (-f). .
, , , , Perforce . , "", .
, .
?
Edit
, :
Perforce ?