documentation/teamSupport/compareEditor/compare_cc.php

<?php  																														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: 		Denis Roy
	# Date:			2005-06-16
	#
	# Description: Type your page comments here - these are not sent to the browser
	#
	#
	#****************************************************************************
	
	#
	# Begin: page-specific settings.  Change these. 
	$pageTitle 		= "Subversive - SVN Team Client";
	$pageKeywords	= "Subversive, Subversion, SVN, Team Provider";
	$pageAuthor		= "Igor Vinnykov";
	
	# Add page-specific Nav bars here
	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
	# $Nav->addNavSeparator("My Page Links", 	"downloads.php");
	# $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);

	# End: page-specific settings
	#
		
	# Paste your HTML content between the EOHTML markers!	
	$html = <<<EOHTML

	<div id="midcolumn">

<h3>Working with conflict changes</h3>
	<p>Let's imagine that the user has a shared project "Some project" associated with his workspace copy. There are files "some_file.txt" and "another_file.cpp" containing in the main project folder. And the two notable developers of the big software company both begin a long and serious editing to "another_file.cpp". But one of the appears to be more quick and commits his changes first. So, when the second developer wants to commit his changes he gets a change conflict error and runs a synchronization. Then the curious developer double clicks on a file marked as containing conflict changes and gets the following picture:</p>
	<img border = "0" src="../../images/conflict_changeC.png" alt="Conflict changes"/>
	<p>So looking at all the changes in a comfortable view the slow developer copies all the appropriate changes to his local file and starts overriding commit.<br/>The work is done!</p>
	<img border="0" src="../../images/rel_tops.png" alt="Related topics"/>
	<br/>
	<a href="../../teamSupport/workspace_synch.php">SVN Workspace Synchronization</a>
	<br/>
	<a href="../../teamSupport/svn_label_decor.php">SVN Label Decorations</a>
	<br/>
	<a href="../../teamSupport/SVNaction/override.php">Overriding operations</a>
	<br/>
	<br/>
	</div>	

EOHTML;


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