<html>
<head>
<title>The Branching Papers -- Perforce FAQs</title>
<head>
<body bgcolor=#ffffff>
<font size=-2><b><a href="branching.html#br12">[INDEX]</a></b></font>
<p>
<b>
A developer changed a bunch of files in our main branch. Then he went
and submitted the identical change to a child branch, '0.95p'.
So, the problem is that 'p4 integrate' on the child branch says that
all those files need merging, but they really don't. So, is there a way to
'fake out' Perforce to tell it that the merge has already been done, or that
it doesn't need to be done?
</b>
<blockquote>
Yes, you can use <b>p4 resolve</b> to fake out Perforce. (Not really a fake-out,
just a matter of letting Perforce know it can ignore a particular integration.)
<p>
In the <b>resolve</b> step you have a choice of 'am', 'at', or 'ay' (meaning
'accept merged', 'accept theirs', or 'accept yours'). If you choose 'ay',
the target file will not be altered in your workspace. When you submit a file
resolved this way, the target file will not be altered in the depot either, but
an integration record will be created so that subsequent <b>p4 integrate</b>
commands will not try to integrate the same change again.
<p>
So say the 'main' branch and the '0.95p' branch were all integrated with
each other. Then Bob, say, submits change 420 to the '0.95p' branch, and then
submits the identical modifications as change 421 to the 'main' branch. To
do the mock integration:
<pre>
p4 integ //depot/0.95p/...@420,420 //depot/main/...
p4 integ //depot/main/...@421,421 //depot/0.95p/...
p4 resolve -ay
p4 submit
</pre>
</blockquote>
<p>
<i>(January 1999)</i>
<p>
<font size=-2><b><a href="branching.html#br12">[INDEX]</a></b></font>
<hr>
<h6>This is file $Id: //guest/laura_wingerd/perforce/faq/br12.html#2 $ in the
<a href="http://public.perforce.com/public/index.html">Perforce Public Depot</a></h6>
</body>
</html>