<?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 resolved</title>
<link rel="stylesheet" type="text/css" href="styles.css" />
<meta name="generator" content="DocBook XSL Stylesheets V1.79.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.ref.svn.html" title="svn Reference—Subversion Command-Line Client" />
<link rel="prev" href="svn.ref.svn.c.resolve.html" title="svn resolve" />
<link rel="next" href="svn.ref.svn.c.revert.html" title="svn revert" />
</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">svn resolved</th>
</tr>
<tr>
<td width="20%" align="left"><a accesskey="p" href="svn.ref.svn.c.resolve.html">Prev</a> </td>
<th width="60%" align="center">svn Reference—Subversion Command-Line Client</th>
<td width="20%" align="right"> <a accesskey="n" href="svn.ref.svn.c.revert.html">Next</a></td>
</tr>
</table>
<hr />
</div>
<div class="refentry">
<a id="svn.ref.svn.c.resolved"></a>
<div class="titlepage"></div>
<a id="idm12796" class="indexterm"></a>
<div class="refnamediv">
<h2>Name</h2>
<p>svn resolved — <span class="emphasis"><em>Deprecated</em></span>.
Remove <span class="quote">“<span class="quote">conflicted</span>”</span> state on working copy
files or directories.</p>
</div>
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<p>
<code class="literal">svn resolved PATH...</code>
</p>
</div>
<div class="refsect1">
<a id="idm12808"></a>
<h2>Description</h2>
<p>This command has been deprecated in favor of
running <strong class="userinput"><code>svn resolve --accept
working <em class="replaceable"><code>PATH</code></em></code></strong>. See
<a class="xref" href="svn.ref.svn.c.resolve.html" title="svn resolve">svn resolve</a> in the preceding
section for details.</p>
<p>Remove <span class="quote">“<span class="quote">conflicted</span>”</span> state on working copy
files or directories. This routine does not semantically
resolve conflict markers; it merely removes
conflict-related artifact files and 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> 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">
<a id="idm12819"></a>
<h2>Options</h2>
<div class="informalexample">
<pre class="screen">
<a class="xref" href="svn.ref.svn.html#svn.ref.svn.sw.depth"><code class="option">--depth</code> <em class="replaceable"><code>ARG</code></em></a>
<a class="xref" href="svn.ref.svn.html#svn.ref.svn.sw.quiet"><code class="option">--quiet</code> (<code class="option">-q</code>)</a>
<a class="xref" href="svn.ref.svn.html#svn.ref.svn.sw.recursive"><code class="option">--recursive</code> (<code class="option">-R</code>)</a>
<a class="xref" href="svn.ref.svn.html#svn.ref.svn.sw.targets"><code class="option">--targets</code> <em class="replaceable"><code>FILENAME</code></em></a>
</pre>
</div>
</div>
<div class="refsect1">
<a id="idm12827"></a>
<h2>Examples</h2>
<p>If you get a conflict on an update, your working
copy will sprout three new files:</p>
<div class="informalexample">
<pre class="screen">
$ svn update
Updating '.':
C foo.c
Updated to revision 31.
Summary of conflicts:
Text conflicts: 1
$ ls foo.c*
foo.c
foo.c.mine
foo.c.r30
foo.c.r31
$
</pre>
</div>
<p>Once you've resolved the conflict and
<code class="filename">foo.c</code> is ready to be committed, run
<span class="command"><strong>svn resolved</strong></span> to let your working copy
know you've taken care of everything.</p>
<div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
<tr>
<td rowspan="2" align="center" valign="top" width="25">
<img alt="[Warning]" src="images/warning.png" />
</td>
<th align="left">Warning</th>
</tr>
<tr>
<td align="left" valign="top">
<p>You <span class="emphasis"><em>can</em></span> just remove the
conflict files and commit, but <span class="command"><strong>svn
resolved</strong></span> fixes up some bookkeeping data
in the working copy administrative area in addition
to removing the conflict files, so we recommend that
you use this command.</p>
</td>
</tr>
</table>
</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.resolve.html">Prev</a> </td>
<td width="20%" align="center">
<a accesskey="u" href="svn.ref.svn.html">Up</a>
</td>
<td width="40%" align="right"> <a accesskey="n" href="svn.ref.svn.c.revert.html">Next</a></td>
</tr>
<tr>
<td width="40%" align="left" valign="top">svn resolve </td>
<td width="20%" align="center">
<a accesskey="h" href="index.html">Home</a>
</td>
<td width="40%" align="right" valign="top"> svn revert</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
>
x86_64
>
media
>
core-updates
>
by-pkgid
>
31498a559ceee64333612647bef4b546
>
files
>
137
