<?xml version="1.0" encoding="utf-8" standalone="no"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Conflict Resolution</title>
<link rel="stylesheet" type="text/css" href="styles.css" />
<meta name="generator" content="DocBook XSL Stylesheets V1.76.1" />
<style type="text/css">
body { background-image: url('images/draft.png');
background-repeat: no-repeat;
background-position: top left;
/* The following properties make the watermark "fixed" on the page. */
/* I think that's just a bit too distracting for the reader... */
/* background-attachment: fixed; */
/* background-position: center center; */
}</style>
<link rel="home" href="index.html" title="Version Control with Subversion [DRAFT]" />
<link rel="up" href="svn.forcvs.html" title="Appendix B. Subversion for CVS Users" />
<link rel="prev" href="svn.forcvs.properties.html" title="Metadata Properties" />
<link rel="next" href="svn.forcvs.binary-and-trans.html" title="Binary Files and Translation" />
</head>
<body>
<div xmlns="" id="vcws-version-notice">
<p>This text is a work in progress—highly subject to
change—and may not accurately describe any released
version of the Apache™ Subversion® software.
Bookmarking or otherwise referring others to this page is
probably not such a smart idea. Please visit
<a href="http://www.svnbook.com/">http://www.svnbook.com/</a>
for stable versions of this book.</p>
</div>
<div class="navheader">
<table width="100%" summary="Navigation header">
<tr>
<th colspan="3" align="center">Conflict Resolution</th>
</tr>
<tr>
<td width="20%" align="left"><a accesskey="p" href="svn.forcvs.properties.html">Prev</a> </td>
<th width="60%" align="center">Appendix B. Subversion for CVS Users</th>
<td width="20%" align="right"> <a accesskey="n" href="svn.forcvs.binary-and-trans.html">Next</a></td>
</tr>
</table>
<hr />
</div>
<div class="sect1" title="Conflict Resolution">
<div class="titlepage">
<div>
<div>
<h2 class="title" style="clear: both"><a id="svn.forcvs.conflicts"></a>Conflict Resolution</h2>
</div>
</div>
</div>
<p>CVS marks conflicts with inline <span class="quote">“<span class="quote">conflict
markers,</span>”</span> and then prints a <code class="literal">C</code> during
an update or merge operation. Historically, this has caused
problems, because CVS isn't doing enough. Many users forget
about (or don't see) the <code class="literal">C</code> after it whizzes
by on their terminal. They often forget that the conflict
markers are even present, and then accidentally commit files
containing those conflict markers.</p>
<p>Subversion solves this problem in a pair of ways. First,
when a conflict occurs in a file, Subversion records the fact
that the file is in a state of conflict, and won't allow you to
commit changes to that file until you explicitly resolve the
conflict. Second, Subversion provides interactive conflict
resolution, which allows you to resolve conflicts as they happen
instead of having to go back and do so after the update or merge
operation completes. See <a class="xref" href="svn.tour.cycle.html#svn.tour.cycle.resolve" title="Resolve Any Conflicts">the section called “Resolve Any Conflicts”</a> for more about conflict resolution in Subversion.</p>
</div>
<div class="navfooter">
<hr />
<table width="100%" summary="Navigation footer">
<tr>
<td width="40%" align="left"><a accesskey="p" href="svn.forcvs.properties.html">Prev</a> </td>
<td width="20%" align="center">
<a accesskey="u" href="svn.forcvs.html">Up</a>
</td>
<td width="40%" align="right"> <a accesskey="n" href="svn.forcvs.binary-and-trans.html">Next</a></td>
</tr>
<tr>
<td width="40%" align="left" valign="top">Metadata Properties </td>
<td width="20%" align="center">
<a accesskey="h" href="index.html">Home</a>
</td>
<td width="40%" align="right" valign="top"> Binary Files and Translation</td>
</tr>
</table>
</div>
<div xmlns="" id="vcws-footer">
<hr />
<img src="images/cc-by.png" style="float: right;" />
<p>You are reading <em>Version Control with Subversion</em> (for
Subversion 1.8), by Ben Collins-Sussman, Brian W. Fitzpatrick,
and C. Michael Pilato.</p>
<p>This work is licensed under
the <a href="http://creativecommons.org/licenses/by/2.0/">Creative Commons Attribution License v2.0</a>.</p>
<p>To submit comments, corrections, or other contributions to the
text, please visit <a href="http://www.svnbook.com/">http://www.svnbook.com/</a>.</p>
</div>
</body>
</html>
distrib
>
Mageia
>
6
>
i586
>
media
>
core-updates
>
by-pkgid
>
d32d95698a59acd37b394f83dfc217c6
>
files
>
72
