In this case, you can’t use P4V and you will need to run the command with the “-i” flag. The problem happens when you need to do a baseless merge when the two branches are not related at all. P4 integrate for release 2004.2 and later always considers (no need for “-i”) indirect integrations through intermediate branches when determining that files are related and what changes need to be integrated and I think that is the reason why the flag has been removed from P4V. However, going from X to Z is an indirect integration. Merging Y to Z is trivial because the two branches are directly related. Indirect integration is when two branches are not directly related to each other like in the following example:
This flag is used to do indirect integrations. I needed to merge two branches without a common ancestor using Perforce Visual Client (P4V) 2015.2 but for my surprise the “-i” flag for p4 integrate has been removed.
0 kommentar(er)
