<!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>Criss-Cross — Bazaar 2.7.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="shortcut icon" href="../_static/bzr.ico"/>
<link rel="search" title="Search" href="../search.html" />
<link rel="next" title="Diverged Branches" href="diverged-branches-help.html" />
<link rel="prev" title="Content Filters" href="content-filters-help.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="diverged-branches-help.html" title="Diverged Branches"
accesskey="N">next</a></li>
<li class="right" >
<a href="content-filters-help.html" title="Content Filters"
accesskey="P">previous</a> |</li>
<li><a href="http://bazaar.canonical.com/">
<img src="../_static/bzr icon 16.png" /> Home</a> | </li>
<a href="http://doc.bazaar.canonical.com/en/">Documentation</a> | </li>
<li class="nav-item nav-item-0"><a href="../index.html">Table of Contents (2.7.0)</a> »</li>
<li class="nav-item nav-item-1"><a href="index.html" accesskey="U">Bazaar User Reference</a> »</li>
</ul>
</div>
<div class="document">
<div class="documentwrapper">
<div class="bodywrapper">
<div class="body" role="main">
<div class="section" id="criss-cross">
<h1>Criss-Cross<a class="headerlink" href="#criss-cross" title="Permalink to this headline">¶</a></h1>
<p>A criss-cross in the branch history can cause the default merge technique
to emit more conflicts than would normally be expected.</p>
<p>In complex merge cases, <code class="docutils literal notranslate"><span class="pre">bzr</span> <span class="pre">merge</span> <span class="pre">--lca</span></code> or <code class="docutils literal notranslate"><span class="pre">bzr</span> <span class="pre">merge</span> <span class="pre">--weave</span></code> may give
better results. You may wish to <code class="docutils literal notranslate"><span class="pre">bzr</span> <span class="pre">revert</span></code> the working tree and merge
again. Alternatively, use <code class="docutils literal notranslate"><span class="pre">bzr</span> <span class="pre">remerge</span></code> on particular conflicted files.</p>
<p>Criss-crosses occur in a branch’s history if two branches merge the same thing
and then merge one another, or if two branches merge one another at the same
time. They can be avoided by having each branch only merge from or into a
designated central branch (a “star topology”).</p>
<p>Criss-crosses cause problems because of the way merge works. Bazaar’s default
merge is a three-way merger; in order to merge OTHER into THIS, it must
find a basis for comparison, BASE. Using BASE, it can determine whether
differences between THIS and OTHER are due to one side adding lines, or
from another side removing lines.</p>
<p>Criss-crosses mean there is no good choice for a base. Selecting the recent
merge points could cause one side’s changes to be silently discarded.
Selecting older merge points (which Bazaar does) mean that extra conflicts
are emitted.</p>
<p>The <code class="docutils literal notranslate"><span class="pre">weave</span></code> merge type is not affected by this problem because it uses
line-origin detection instead of a basis revision to determine the cause of
differences.</p>
</div>
</div>
</div>
</div>
<div class="sphinxsidebar" role="navigation" aria-label="main navigation">
<div class="sphinxsidebarwrapper">
<h4>Previous topic</h4>
<p class="topless"><a href="content-filters-help.html"
title="previous chapter">Content Filters</a></p>
<h4>Next topic</h4>
<p class="topless"><a href="diverged-branches-help.html"
title="next chapter">Diverged Branches</a></p>
<div role="note" aria-label="source link">
<h3>This Page</h3>
<ul class="this-page-menu">
<li><a href="../_sources/user-reference/criss-cross-help.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="diverged-branches-help.html" title="Diverged Branches"
>next</a></li>
<li class="right" >
<a href="content-filters-help.html" title="Content Filters"
>previous</a> |</li>
<li><a href="http://bazaar.canonical.com/">
<img src="../_static/bzr icon 16.png" /> Home</a> | </li>
<a href="http://doc.bazaar.canonical.com/en/">Documentation</a> | </li>
<li class="nav-item nav-item-0"><a href="../index.html">Table of Contents (2.7.0)</a> »</li>
<li class="nav-item nav-item-1"><a href="index.html" >Bazaar User Reference</a> »</li>
</ul>
</div>
<div class="footer" role="contentinfo">
© Copyright 2009-2011 Canonical Ltd.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.8.4.
</div>
</body>
</html>
