| Current Path : /usr/share/doc/nextcloud-desktop/html/ |
Linux ift1.ift-informatik.de 5.4.0-216-generic #236-Ubuntu SMP Fri Apr 11 19:53:21 UTC 2025 x86_64 |
| Current File : //usr/share/doc/nextcloud-desktop/html/conflicts.html |
<!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="X-UA-Compatible" content="IE=Edge" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Conflicts — Nextcloud Client Manual 2.4.0 documentation</title>
<link rel="stylesheet" href="_static/classic.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="_static/language_data.js"></script>
<link rel="index" title="Index" href="genindex.html" />
<link rel="search" title="Search" href="search.html" />
<link rel="next" title="Advanced Usage" href="advancedusage.html" />
<link rel="prev" title="Using the Synchronization Client" href="navigating.html" />
</head><body>
<div class="related" role="navigation" aria-label="related navigation">
<h3>Navigation</h3>
<ul>
<li class="right" style="margin-right: 10px">
<a href="genindex.html" title="General Index"
accesskey="I">index</a></li>
<li class="right" >
<a href="advancedusage.html" title="Advanced Usage"
accesskey="N">next</a> |</li>
<li class="right" >
<a href="navigating.html" title="Using the Synchronization Client"
accesskey="P">previous</a> |</li>
<li class="nav-item nav-item-0"><a href="index.html">Client Manual</a> »</li>
</ul>
</div>
<div class="document">
<div class="documentwrapper">
<div class="bodywrapper">
<div class="body" role="main">
<div class="section" id="conflicts">
<h1>Conflicts<a class="headerlink" href="#conflicts" title="Permalink to this headline">¶</a></h1>
<div class="section" id="overview">
<span id="index-0"></span><h2>Overview<a class="headerlink" href="#overview" title="Permalink to this headline">¶</a></h2>
<p>The ownCloud desktop client uploads local changes and downloads remote changes.
When a file has changed on the local side and on the remote between synchronization
runs the client will be unable to resolve the situation on its own. It will
create a conflict file with the local version, download the remote version and
notify the user that a conflict occured which needs attention.</p>
</div>
<div class="section" id="example">
<h2>Example<a class="headerlink" href="#example" title="Permalink to this headline">¶</a></h2>
<p>Imagine there is a file called <code class="docutils literal notranslate"><span class="pre">mydata.txt</span></code> your synchronized folder. It has
not changed for a while and contains the text “contents” locally and remotely.
Now, nearly at the same time you update it locally to say “local contents” while
the file on the server gets updated to contain “remote contents” by someone else.</p>
<p>When attempting to upload your local changes the desktop client will notice that
the server version has also changed. It creates a conflict and you will now have
two files on your local machine:</p>
<ul class="simple">
<li><code class="docutils literal notranslate"><span class="pre">mydata.txt</span></code> containing “remote contents”</li>
<li><code class="docutils literal notranslate"><span class="pre">mydata</span> <span class="pre">(conflicted</span> <span class="pre">copy</span> <span class="pre">2018-04-10</span> <span class="pre">093612).txt</span></code> containing “local contents”</li>
</ul>
<p>In this situation the file <code class="docutils literal notranslate"><span class="pre">mydata.txt</span></code> has the remote changes (and will continue
to be updated with further remote changes when they happen), but your local
adjustments have not been sent to the server (unless the server enables conflict
uploading, see below).</p>
<p>The desktop client notifies you of this situation via system notifications, the
system tray icon and a yellow “unresolved conflicts” badge in the account settings
window. Clicking this badge shows a list that includes the unresolved conflicts
and clicking one of them opens an explorer window pointing at the relevant file.</p>
<p>To resolve this conflict, open both files, compare the differences and copy your
local changes from the “conflicted copy” file into the base file where applicable.
In this example you might change <code class="docutils literal notranslate"><span class="pre">mydata.txt</span></code> to say “local and remote contents”
and delete the file with “conflicted copy” in its name. With that, the conflict
is resolved.</p>
</div>
<div class="section" id="uploading-conflicts-experimental">
<h2>Uploading conflicts (experimental)<a class="headerlink" href="#uploading-conflicts-experimental" title="Permalink to this headline">¶</a></h2>
<p>By default the conflict file (the file with “conflicted copy” in its name that
contains your local conflicting changes) is not uploaded to the server. The idea
is that you, the author of the changes, are the best person for resolving the
conflict and showing the conflict to other users might create confusion.</p>
<p>However, in some scenarios it makes a lot of sense to upload these conflicting
changes such that local work can become visible even if the conflict won’t be
resolved immediately.</p>
<p>In the future there might be a server-wide switch for this behavior. For now it
can already be tested by setting the environment variable
<code class="docutils literal notranslate"><span class="pre">OWNCLOUD_UPLOAD_CONFLICT_FILES=1</span></code>.</p>
</div>
</div>
</div>
</div>
</div>
<div class="sphinxsidebar" role="navigation" aria-label="main navigation">
<div class="sphinxsidebarwrapper">
<h3><a href="index.html">Table of Contents</a></h3>
<ul>
<li><a class="reference internal" href="#">Conflicts</a><ul>
<li><a class="reference internal" href="#overview">Overview</a></li>
<li><a class="reference internal" href="#example">Example</a></li>
<li><a class="reference internal" href="#uploading-conflicts-experimental">Uploading conflicts (experimental)</a></li>
</ul>
</li>
</ul>
<h4>Previous topic</h4>
<p class="topless"><a href="navigating.html"
title="previous chapter">Using the Synchronization Client</a></p>
<h4>Next topic</h4>
<p class="topless"><a href="advancedusage.html"
title="next chapter">Advanced Usage</a></p>
<div role="note" aria-label="source link">
<h3>This Page</h3>
<ul class="this-page-menu">
<li><a href="_sources/conflicts.rst.txt"
rel="nofollow">Show Source</a></li>
</ul>
</div>
<div id="searchbox" style="display: none" role="search">
<h3>Quick search</h3>
<div class="searchformwrapper">
<form class="search" action="search.html" method="get">
<input type="text" name="q" />
<input type="submit" value="Go" />
<input type="hidden" name="check_keywords" value="yes" />
<input type="hidden" name="area" value="default" />
</form>
</div>
</div>
<script type="text/javascript">$('#searchbox').show(0);</script>
</div>
</div>
<div class="clearer"></div>
</div>
<div class="related" role="navigation" aria-label="related navigation">
<h3>Navigation</h3>
<ul>
<li class="right" style="margin-right: 10px">
<a href="genindex.html" title="General Index"
>index</a></li>
<li class="right" >
<a href="advancedusage.html" title="Advanced Usage"
>next</a> |</li>
<li class="right" >
<a href="navigating.html" title="Using the Synchronization Client"
>previous</a> |</li>
<li class="nav-item nav-item-0"><a href="index.html">Client Manual</a> »</li>
</ul>
</div>
<div class="footer" role="contentinfo">
© Copyright 2013-2020, The Nextcloud developers.
Last updated on Mar 24, 2020.
</div>
</body>
</html>