P4API.MergeAction.html #1

  • //
  • guest/
  • shawn_hladky/
  • P4.Net/
  • main/
  • doc/
  • html/
  • P4API.MergeAction.html
  • View
  • Commits
  • Open Download .zip Download (4 KB)
<html dir="LTR">
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=Windows-1252" />
    <meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5" />
    <title>MergeAction Enumeration</title>
    <xml>
    </xml>
    <link rel="stylesheet" type="text/css" href="MSDN.css" />
  </head>
  <body id="bodyID" class="dtBODY">
    <div id="nsbanner">	<div id="bannerrow1">
		<table class="bannerparthead" cellspacing="0" id="Table1">
			<tr id="hdr">
				<td class="runninghead">Perforce API for the .Net CLR</td>
				<td class="product"><img alt="P4.Net" src="p4net.GIF" /></td>
			</tr>
		</table>
	</div>
	<div id="TitleRow">
		<h1 class="dtH1">MergeAction Enumeration</h1>
</div>
</div>
    <div id="nstext">
      <p> Actions to take when resolving a file. </p>
      <div class="syntax">
        <span class="lang">[VisualBasic]</span>
        <br />PublicEnumMergeAction</div>
      <div class="syntax">
        <span class="lang">[C#]</span>
        <div>publicenumMergeAction</div>
      </div>
      <h4 class="dtH4">Remarks</h4>
      <p>
            </p>
      <h4 class="dtH4">Members</h4>
      <div class="tablediv">
        <table class="dtTABLE" cellspacing="0">
          <tr valign="top">
            <th width="50%">Member Name</th>
            <th width="50%">Description</th>
          </tr>
<tr valign="top"><td><b>Quit</b></td><td> Quit the resolve workflow. </td></tr>
<tr valign="top"><td><b>Skip</b></td><td> Skip this file in the resolve workflow. </td></tr>
<tr valign="top"><td><b>AcceptMerged</b></td><td> Accept the merged file from Perforce. This file must not be edited. </td></tr>
<tr valign="top"><td><b>AcceptEdit</b></td><td> Accept the result file with your edits. The result file should be edited before returning this merge action. </td></tr>
<tr valign="top"><td><b>AcceptTheirs</b></td><td> Accept 'their' file ('your' changes will be lost). </td></tr>
<tr valign="top"><td><b>AcceptYours</b></td><td> Accept 'your' file ('thier' changes will be lost). </td></tr></table>
      </div>
      <h4 class="dtH4">Requirements</h4>
      <p>
        <b>Namespace: </b>
        <a href="P4API.html">P4API</a>
      </p>
      <p>
        <b>Assembly: </b>p4api (in p4api.dll)
					</p>
      <h4 class="dtH4">See Also</h4>
      <p>
        <a href="P4API.html">P4API Namespace</a>
      </p>
      <object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e" viewastext="true" style="display: none;">
        <param name="Keyword" value="MergeAction enumeration">
        </param>
        <param name="Keyword" value="P4API.MergeAction enumeration">
        </param>
        <param name="Keyword" value="Quit enumeration member">
        </param>
        <param name="Keyword" value="MergeAction.Quit enumeration member">
        </param>
        <param name="Keyword" value="Skip enumeration member">
        </param>
        <param name="Keyword" value="MergeAction.Skip enumeration member">
        </param>
        <param name="Keyword" value="AcceptMerged enumeration member">
        </param>
        <param name="Keyword" value="MergeAction.AcceptMerged enumeration member">
        </param>
        <param name="Keyword" value="AcceptEdit enumeration member">
        </param>
        <param name="Keyword" value="MergeAction.AcceptEdit enumeration member">
        </param>
        <param name="Keyword" value="AcceptTheirs enumeration member">
        </param>
        <param name="Keyword" value="MergeAction.AcceptTheirs enumeration member">
        </param>
        <param name="Keyword" value="AcceptYours enumeration member">
        </param>
        <param name="Keyword" value="MergeAction.AcceptYours enumeration member">
        </param>
      </object>
      <hr />
      <div id="footer">
        <p>
          <a href="Copyright.html">Copyright  2006 Shawn Hladky</a>
        </p>
        <p>
        </p>
      </div>
    </div>
  </body>
</html>
# Change User Description Committed
#1 7709 Shawn Hladky P4.Net:  Cleanup, documentation, and a a start for implementing an object-based output for filelog.