182 lines
7.6 KiB
HTML
182 lines
7.6 KiB
HTML
<?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>svn resolve</title>
|
||
<link rel="stylesheet" href="styles.css" type="text/css" />
|
||
<meta name="generator" content="DocBook XSL Stylesheets V1.75.2" />
|
||
<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.ref.svn.html#svn.ref.svn.c" title="svn Subcommands" />
|
||
<link rel="prev" href="svn.ref.svn.c.relocate.html" title="svn relocate" />
|
||
<link rel="next" href="svn.ref.svn.c.resolved.html" title="svn resolved" />
|
||
</head>
|
||
<body>
|
||
<div class="navheader">
|
||
<table width="100%" summary="Navigation header">
|
||
<tr>
|
||
<th colspan="3" align="center">svn resolve</th>
|
||
</tr>
|
||
<tr>
|
||
<td width="20%" align="left"><a accesskey="p" href="svn.ref.svn.c.relocate.html">Prev</a> </td>
|
||
<th width="60%" align="center">svn Subcommands</th>
|
||
<td width="20%" align="right"> <a accesskey="n" href="svn.ref.svn.c.resolved.html">Next</a></td>
|
||
</tr>
|
||
</table>
|
||
<hr />
|
||
</div>
|
||
<div class="refentry" title="svn resolve">
|
||
<a id="svn.ref.svn.c.resolve"></a>
|
||
<div class="titlepage"></div>
|
||
<a id="idp43278992" class="indexterm"></a>
|
||
<div class="refnamediv">
|
||
<h2>Name</h2>
|
||
<p>svn resolve — Resolve conflicts on working copy files or
|
||
directories.</p>
|
||
</div>
|
||
<div class="refsect1" title="Synopsis">
|
||
<a id="idp43282096"></a>
|
||
<h2>Synopsis</h2>
|
||
<p>
|
||
<code class="literal">svn resolve PATH...</code>
|
||
</p>
|
||
</div>
|
||
<div class="refsect1" title="Description">
|
||
<a id="idp43283712"></a>
|
||
<h2>Description</h2>
|
||
<p>Resolve <span class="quote">“<span class="quote">conflicted</span>”</span> state on working
|
||
copy files or directories. This routine does not
|
||
semantically resolve conflict markers; however, it
|
||
replaces <em class="replaceable"><code>PATH</code></em> with the version
|
||
specified by the <code class="option">--accept</code> argument and
|
||
then removes conflict-related artifact files. This allows
|
||
<em class="replaceable"><code>PATH</code></em> to be committed
|
||
again—that is, it tells Subversion that the
|
||
conflicts have been
|
||
<span class="quote">“<span class="quote">resolved.</span>”</span>. You can pass the following
|
||
arguments to the <code class="option">--accept</code> command
|
||
depending on your desired resolution:</p>
|
||
<div class="variablelist">
|
||
<dl>
|
||
<dt>
|
||
<span class="term">
|
||
<code class="literal">base</code>
|
||
</span>
|
||
</dt>
|
||
<dd>
|
||
<p>Choose the file that was the
|
||
<code class="literal">BASE</code> revision before you updated
|
||
your working copy. That is, the file that you
|
||
checked out before you made your latest
|
||
edits.</p>
|
||
</dd>
|
||
<dt>
|
||
<span class="term">
|
||
<code class="literal">working</code>
|
||
</span>
|
||
</dt>
|
||
<dd>
|
||
<p>Assuming that you've manually handled the
|
||
conflict resolution, choose the version of the file as
|
||
it currently stands in your working copy.</p>
|
||
</dd>
|
||
<dt>
|
||
<span class="term">
|
||
<code class="literal">mine-full</code>
|
||
</span>
|
||
</dt>
|
||
<dd>
|
||
<p>Resolve all conflicted files with copies of the
|
||
files as they stood immediately before you
|
||
ran <span class="command"><strong>svn update</strong></span>.</p>
|
||
</dd>
|
||
<dt>
|
||
<span class="term">
|
||
<code class="literal">theirs-full</code>
|
||
</span>
|
||
</dt>
|
||
<dd>
|
||
<p>Resolve all conflicted files with copies of the
|
||
files that were fetched from the server when you
|
||
ran <span class="command"><strong>svn update</strong></span>.</p>
|
||
</dd>
|
||
</dl>
|
||
</div>
|
||
<p>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 an in-depth look at
|
||
resolving conflicts.</p>
|
||
</div>
|
||
<div class="refsect1" title="Options">
|
||
<a id="idp43300288"></a>
|
||
<h2>Options</h2>
|
||
<div class="informalexample">
|
||
<pre class="screen">
|
||
--accept ACTION
|
||
--depth ARG
|
||
--quiet (-q)
|
||
--recursive (-R)
|
||
--targets FILENAME
|
||
</pre>
|
||
</div>
|
||
</div>
|
||
<div class="refsect1" title="Examples">
|
||
<a id="idp43302192"></a>
|
||
<h2>Examples</h2>
|
||
<p>Here's an example where, after a postponed conflict
|
||
resolution during update, <span class="command"><strong>svn resolve</strong></span>
|
||
replaces the all conflicts in
|
||
file <code class="filename">foo.c</code> with your edits:</p>
|
||
<div class="informalexample">
|
||
<pre class="screen">
|
||
$ svn update
|
||
Updating '.':
|
||
Conflict discovered in 'foo.c'.
|
||
Select: (p) postpone, (df) diff-full, (e) edit,
|
||
(mc) mine-conflict, (tc) theirs-conflict,
|
||
(s) show all options: p
|
||
C foo.c
|
||
Updated to revision 5.
|
||
Summary of conflicts:
|
||
Text conflicts: 1
|
||
$ svn resolve --accept mine-full foo.c
|
||
Resolved conflicted state of 'foo.c'
|
||
$
|
||
</pre>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
<div class="navfooter">
|
||
<hr />
|
||
<table width="100%" summary="Navigation footer">
|
||
<tr>
|
||
<td width="40%" align="left"><a accesskey="p" href="svn.ref.svn.c.relocate.html">Prev</a> </td>
|
||
<td width="20%" align="center">
|
||
<a accesskey="u" href="svn.ref.svn.html#svn.ref.svn.c">Up</a>
|
||
</td>
|
||
<td width="40%" align="right"> <a accesskey="n" href="svn.ref.svn.c.resolved.html">Next</a></td>
|
||
</tr>
|
||
<tr>
|
||
<td width="40%" align="left" valign="top">svn relocate </td>
|
||
<td width="20%" align="center">
|
||
<a accesskey="h" href="index.html">Home</a>
|
||
</td>
|
||
<td width="40%" align="right" valign="top"> svn resolved</td>
|
||
</tr>
|
||
</table>
|
||
</div>
|
||
<div xmlns="" id="svn-footer">
|
||
<hr />
|
||
<p>You are reading <em>Version Control with Subversion</em> (for Subversion 1.7), by Ben Collins-Sussman, Brian W. Fitzpatrick, and C. Michael Pilato.<br />
|
||
This work is licensed under the <a href="http://creativecommons.org/licenses/by/2.0/">Creative Commons Attribution License v2.0</a>.<br />
|
||
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>
|