documentation/teamSupport/SVNaction/merge.php

<?php
	set_include_path($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common" . PATH_SEPARATOR . $_SERVER['DOCUMENT_ROOT'] . "/projects" . PATH_SEPARATOR . get_include_path()); 
	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); 
	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php");  
	require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php");  
	$App = new App(); 
	$Nav = new Nav(); 
	$Menu = new Menu();  
	include($App->getProjectCommon());    
	# All on the same line to unclutter the user's desktop'

	#*****************************************************************************
	#
	# template.php
	#
	# Author: 		Igor Vinnykov
	# Date:			2008-07-01
	#
	# Description: Autogenerated for eclipse.org site pages from Eclipse IDE help
	#
	#
	#****************************************************************************
	
	#
	# Begin: page-specific settings.  Change these. 
	$pageTitle 		= "Eclipse Subversive - Documentation";
	$pageKeywords	= "Subversive, Subversion, SVN, Team Provider, documentation, user guid";
	$pageAuthor		= "Igor Vinnykov";
		
	include("_projectCommon.php");    # All on the same line to unclutter the user's desktop'
	
	# Paste your HTML content between the EOHTML markers!	
	$html = <<<EOHTML

	<div id="midcolumn">

<h3>Merging</h3>
	<p>Merging means creating a version by blending different revisions of resources. To start merging click <i>'Team>Merge...'</i> menu item of the resource pop-up menu, <i>'Merge...'</i> menu item of the SVN main menu group or on the <i>'Merge...'</i> button on the <i>'SVN Toolbar'</i>. The Merge Dialog will appear and to perform operation user should follow its instructions and fill needed properties.</p>
	<table cellpadding="1" cellspacing="0" border="0">
		<tr>
			<td valign="top" align="left">
				<p align="left">
					<i>
						<b>Note:</b>
					</i>
				</p>
			</td>
			<td valign="top">
				<p>
					<i>
						If there were some conflicts during the merge operation cycle SVN&reg; merges what it can and notify the user about the conflict. Then three file are created: 'name'.tmp (copy of the user's local file before update), 'name'.tmp2 (copy of the first revision file) and 'name'.tmp3 (copy of the second revision file). So the edit conflicts action must be run to resolve conflicts.
					</i>
				</p>
			</td>
		</tr>
	</table>
	<p>If the option of interactive merge is enabled then the merge results are shown in the <i>'SVN Merge View'</i>. The changes that can't be done by Subversion while merge are also shown in this view and can be merged or skipped manually.</p>
	<img border="0" src="../../images/merge_view.png" alt="Related topics"/></br>
	<img border="0" src="../../images/rel_tops.png" alt="Related topics"/>
	<br/>
	<a href="../../teamSupport/merge_dialog.php">SVN Merge Dialog</a>
	<br/>
	<a href="../../teamSupport/svn_main_menu.php">SVN main menu group</a>
	<br/>
	<a href="../../teamSupport/svn_toolbar.php">SVN Toolbar</a>
	<br/>
	<br/>
	</div>	

EOHTML;


	# Generate the web page
	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
?>