278 lines
13 KiB
HTML
278 lines
13 KiB
HTML
|
||
|
||
<!DOCTYPE html>
|
||
<html class="writer-html5" lang="en" data-content_root="../">
|
||
<head>
|
||
<meta charset="utf-8" />
|
||
<meta name="readthedocs-addons-api-version" content="1"><meta name="viewport" content="width=device-width, initial-scale=1" />
|
||
|
||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||
<title>Conflicts — F7cloud latest User Manual latest documentation</title>
|
||
<link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=b86133f3" />
|
||
<link rel="stylesheet" type="text/css" href="../_static/css/theme.css?v=e59714d7" />
|
||
<link rel="stylesheet" type="text/css" href="../_static/copybutton.css?v=76b2166b" />
|
||
<link rel="stylesheet" type="text/css" href="../_static/custom.css?v=8ff6e0db" />
|
||
<link rel="stylesheet" type="text/css" href="../_static/dark_mode_css/general.css?v=c0a7eb24" />
|
||
<link rel="stylesheet" type="text/css" href="../_static/dark_mode_css/dark.css?v=70edf1c7" />
|
||
|
||
|
||
<script src="../_static/jquery.js?v=5d32c60e"></script>
|
||
<script src="../_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
|
||
<script src="../_static/documentation_options.js?v=a49d5d77"></script>
|
||
<script src="../_static/doctools.js?v=9bcbadda"></script>
|
||
<script src="../_static/sphinx_highlight.js?v=dc90522c"></script>
|
||
<script src="../_static/clipboard.min.js?v=a7894cd8"></script>
|
||
<script src="../_static/copybutton.js?v=f281be69"></script>
|
||
<script src="../_static/dark_mode_js/default_light.js?v=c2e647ce"></script>
|
||
<script src="../_static/dark_mode_js/theme_switcher.js?v=358d3910"></script>
|
||
<script src="../_static/js/theme.js"></script>
|
||
<script src="../_static/js/versions.js"></script>
|
||
<link rel="index" title="Index" href="../genindex.html" />
|
||
<link rel="search" title="Search" href="../search.html" />
|
||
<link rel="next" title="FAQ" href="faq.html" />
|
||
<link rel="prev" title="Update channels" href="updatechannel.html" />
|
||
</head>
|
||
|
||
<body class="wy-body-for-nav">
|
||
<div class="wy-grid-for-nav">
|
||
<nav data-toggle="wy-nav-shift" class="wy-nav-side">
|
||
<div class="wy-side-scroll">
|
||
<div class="wy-side-nav-search" >
|
||
|
||
|
||
|
||
<a href="../contents.html">
|
||
|
||
<img src="../_static/logo-white.png" class="logo" alt="Logo"/>
|
||
</a>
|
||
<div class="switch-menus">
|
||
<div class="version-switch"></div>
|
||
<div class="language-switch"></div>
|
||
</div>
|
||
<div role="search">
|
||
<form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
|
||
<input type="text" name="q" placeholder="Search docs" aria-label="Search docs" />
|
||
<input type="hidden" name="check_keywords" value="yes" />
|
||
<input type="hidden" name="area" value="default" />
|
||
</form>
|
||
</div>
|
||
</div><div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="Navigation menu">
|
||
<ul class="current">
|
||
<li class="toctree-l1"><a class="reference internal" href="../index.html">F7cloud latest user manual introduction</a></li>
|
||
<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The F7cloud Web interface</a></li>
|
||
<li class="toctree-l1"><a class="reference internal" href="../files/index.html">Files & synchronization</a></li>
|
||
<li class="toctree-l1"><a class="reference internal" href="../groupware/index.html">Groupware</a></li>
|
||
<li class="toctree-l1"><a class="reference internal" href="../talk/index.html">Talk</a></li>
|
||
<li class="toctree-l1 current"><a class="reference internal" href="index.html">Desktop Clients</a><ul class="current">
|
||
<li class="toctree-l2"><a class="reference internal" href="installation.html">Installation</a></li>
|
||
<li class="toctree-l2"><a class="reference internal" href="usage.html">Using the Synchronization Client</a></li>
|
||
<li class="toctree-l2"><a class="reference internal" href="macosvfs.html">macOS Virtual Files client</a></li>
|
||
<li class="toctree-l2"><a class="reference internal" href="autoupdate.html">The Automatic Updater</a></li>
|
||
<li class="toctree-l2"><a class="reference internal" href="updatechannel.html">Update channels</a></li>
|
||
<li class="toctree-l2 current"><a class="current reference internal" href="#">Conflicts</a><ul>
|
||
<li class="toctree-l3"><a class="reference internal" href="#overview">Overview</a></li>
|
||
<li class="toctree-l3"><a class="reference internal" href="#example">Example</a></li>
|
||
<li class="toctree-l3"><a class="reference internal" href="#uploading-conflicts-experimental">Uploading conflicts (experimental)</a></li>
|
||
</ul>
|
||
</li>
|
||
<li class="toctree-l2"><a class="reference internal" href="faq.html">FAQ</a></li>
|
||
</ul>
|
||
</li>
|
||
<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Setting your preferences</a></li>
|
||
<li class="toctree-l1"><a class="reference internal" href="../universal_access.html">Universal access</a></li>
|
||
<li class="toctree-l1"><a class="reference internal" href="../user_2fa.html">Using two-factor authentication</a></li>
|
||
<li class="toctree-l1"><a class="reference internal" href="../session_management.html">Manage connected browsers and devices</a></li>
|
||
<li class="toctree-l1"><a class="reference internal" href="../external_storage/index.html">External Storage</a></li>
|
||
</ul>
|
||
|
||
</div>
|
||
</div>
|
||
</nav>
|
||
|
||
<section data-toggle="wy-nav-shift" class="wy-nav-content-wrap"><nav class="wy-nav-top" aria-label="Mobile navigation menu" >
|
||
<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
|
||
<a href="../contents.html">F7cloud latest User Manual</a>
|
||
</nav>
|
||
|
||
<div class="wy-nav-content">
|
||
<div class="rst-content style-external-links">
|
||
<div role="navigation" aria-label="Page navigation">
|
||
<ul class="wy-breadcrumbs">
|
||
<li><a href="../contents.html" class="icon icon-home" aria-label="Home"></a></li>
|
||
<li class="breadcrumb-item"><a href="index.html">Desktop Clients</a></li>
|
||
<li class="breadcrumb-item active">Conflicts</li>
|
||
<li class="wy-breadcrumbs-aside">
|
||
<a href="https://github.com/f7cloud/documentation/edit/master/user_manual/desktop/conflicts.rst" class="fa fa-github"> Edit on GitHub</a>
|
||
</li>
|
||
</ul>
|
||
<hr/>
|
||
</div>
|
||
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
|
||
<div itemprop="articleBody">
|
||
|
||
<section id="conflicts">
|
||
<h1>Conflicts<a class="headerlink" href="#conflicts" title="Link to this heading"></a></h1>
|
||
<section id="overview">
|
||
<h2>Overview<a class="headerlink" href="#overview" title="Link to this heading"></a></h2>
|
||
<p>The F7cloud 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 occurred which needs attention.</p>
|
||
</section>
|
||
<section id="example">
|
||
<h2>Example<a class="headerlink" href="#example" title="Link to this heading"></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><p><code class="docutils literal notranslate"><span class="pre">mydata.txt</span></code> containing “remote contents”</p></li>
|
||
<li><p><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”</p></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>
|
||
</section>
|
||
<section id="uploading-conflicts-experimental">
|
||
<h2>Uploading conflicts (experimental)<a class="headerlink" href="#uploading-conflicts-experimental" title="Link to this heading"></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>
|
||
</section>
|
||
</section>
|
||
|
||
|
||
</div>
|
||
</div>
|
||
<footer><div class="rst-footer-buttons" role="navigation" aria-label="Footer">
|
||
<a href="updatechannel.html" class="btn btn-neutral float-left" title="Update channels" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left" aria-hidden="true"></span> Previous</a>
|
||
<a href="faq.html" class="btn btn-neutral float-right" title="FAQ" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right" aria-hidden="true"></span></a>
|
||
</div>
|
||
|
||
<hr/>
|
||
|
||
<div role="contentinfo">
|
||
<p>© Copyright 2016-2026 F7cloud GmbH and F7cloud contributors.</p>
|
||
</div>
|
||
|
||
|
||
|
||
</footer>
|
||
</div>
|
||
</div>
|
||
</section>
|
||
</div>
|
||
|
||
|
||
<!-- Here go the languages -->
|
||
|
||
<div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
|
||
<span class="rst-current-version" data-toggle="rst-current-version">
|
||
🌐
|
||
|
||
|
||
English
|
||
|
||
<span class="fa fa-caret-down"></span>
|
||
|
||
☁️ latest
|
||
<span class="fa fa-caret-down"></span>
|
||
</span>
|
||
<div class="rst-other-versions">
|
||
<dl>
|
||
<dt>🌐 Languages</dt>
|
||
|
||
</dl>
|
||
</div>
|
||
<div class="rst-other-versions">
|
||
<dl>
|
||
<dt>☁️ Versions</dt>
|
||
|
||
<dd style="width: 32%">
|
||
<a href="https://docs.f7cloud.com/server/latest/user_manual"
|
||
|
||
style="color: var(--dark-link-color);"
|
||
|
||
>
|
||
latest
|
||
</a>
|
||
</dd>
|
||
|
||
<dd style="width: 32%">
|
||
<a href="https://docs.f7cloud.com/server/stable/user_manual"
|
||
|
||
>
|
||
stable
|
||
</a>
|
||
</dd>
|
||
|
||
<dd style="width: 32%">
|
||
<a href="https://docs.f7cloud.com/server/31/user_manual"
|
||
|
||
>
|
||
31
|
||
</a>
|
||
</dd>
|
||
|
||
<dd style="width: 32%">
|
||
<a href="https://docs.f7cloud.com/server/30/user_manual"
|
||
|
||
>
|
||
30
|
||
</a>
|
||
</dd>
|
||
|
||
<dd style="width: 32%">
|
||
<a href="https://docs.f7cloud.com/server/29/user_manual"
|
||
|
||
>
|
||
29
|
||
</a>
|
||
</dd>
|
||
|
||
</dl>
|
||
<dl>
|
||
<dt>Downloads</dt>
|
||
|
||
</dl>
|
||
<dl>
|
||
|
||
<dt>On Read the Docs</dt>
|
||
<dd>
|
||
<a href="///projects//?fromdocs=">Project Home</a>
|
||
</dd>
|
||
<dd>
|
||
<a href="///builds//?fromdocs=">Builds</a>
|
||
</dd>
|
||
</dl>
|
||
</div>
|
||
</div>
|
||
<script>
|
||
jQuery(function () {
|
||
SphinxRtdTheme.Navigation.enable(true);
|
||
});
|
||
</script>
|
||
|
||
</body>
|
||
</html> |