<!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>Resolving conflicts — 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="Annotating changes" href="annotating_changes.html" />
<link rel="prev" title="Merging changes" href="merging_changes.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="annotating_changes.html" title="Annotating changes"
accesskey="N">next</a></li>
<li class="right" >
<a href="merging_changes.html" title="Merging changes"
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 Guide</a> »</li>
</ul>
</div>
<div class="document">
<div class="documentwrapper">
<div class="bodywrapper">
<div class="body" role="main">
<div class="section" id="resolving-conflicts">
<h1>Resolving conflicts<a class="headerlink" href="#resolving-conflicts" title="Permalink to this headline">¶</a></h1>
<div class="section" id="workflow">
<h2>Workflow<a class="headerlink" href="#workflow" title="Permalink to this headline">¶</a></h2>
<p>Unlike some other tools that force you to resolve each conflict during
the merge process, Bazaar merges as much as it can and then reports the
conflicts. This can make conflict resolution easier because the contents
of the whole post-merge tree are available to help you decide how things
ought to be resolved. You may also wish to selectively run tests as you go
to confirm each resolution or group or resolutions is good.</p>
</div>
<div class="section" id="listing-conflicts">
<h2>Listing conflicts<a class="headerlink" href="#listing-conflicts" title="Permalink to this headline">¶</a></h2>
<p>As well as being reported by the <code class="docutils literal notranslate"><span class="pre">merge</span></code> command, the list of outstanding
conflicts may be displayed at any time by using the <code class="docutils literal notranslate"><span class="pre">conflicts</span></code>
command. It is also included as part of the output from the <code class="docutils literal notranslate"><span class="pre">status</span></code>
command.</p>
</div>
<div class="section" id="resolving-a-conflict">
<h2>Resolving a conflict<a class="headerlink" href="#resolving-a-conflict" title="Permalink to this headline">¶</a></h2>
<p>When a conflict is encountered, the <code class="docutils literal notranslate"><span class="pre">merge</span></code> command puts embedded
markers in each file showing the areas it couldn’t resolve. It also
creates 3 files for each file with a conflict:</p>
<blockquote>
<div><ul class="simple">
<li>foo.BASE</li>
<li>foo.THIS</li>
<li>foo.OTHER</li>
</ul>
</div></blockquote>
<p>where <code class="docutils literal notranslate"><span class="pre">foo</span></code> is the name of the conflicted file.
In many cases, you can resolve conflicts by simply manually editing
each file in question, fixing the relevant areas and removing the
conflict markers as you go.</p>
<p>After fixing all the files in conflict, and removing the markers,
ask Bazaar to mark them as resolved using the <code class="docutils literal notranslate"><span class="pre">resolve</span></code> command like this:</p>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">bzr</span> <span class="n">resolve</span>
</pre></div>
</div>
<p>Alternatively, after fixing each file, you can mark it as resolved
like this:</p>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">bzr</span> <span class="n">resolve</span> <span class="n">foo</span>
</pre></div>
</div>
<p>Among other things, the <code class="docutils literal notranslate"><span class="pre">resolve</span></code> command cleans up the BASE,
THIS and OTHER files from your working tree.</p>
</div>
<div class="section" id="using-the-remerge-command">
<h2>Using the remerge command<a class="headerlink" href="#using-the-remerge-command" title="Permalink to this headline">¶</a></h2>
<p>In some cases, you may wish to try a different merge algorithm on a
given file. To do this, use the <code class="docutils literal notranslate"><span class="pre">remerge</span></code> command nominating
the file like this:</p>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">bzr</span> <span class="n">remerge</span> <span class="o">--</span><span class="n">weave</span> <span class="n">foo</span>
</pre></div>
</div>
<p>where <code class="docutils literal notranslate"><span class="pre">foo</span></code> is the file and <code class="docutils literal notranslate"><span class="pre">weave</span></code> is one of the available
merge algorithms. This algorithm is particularly useful when a
so-called <code class="docutils literal notranslate"><span class="pre">criss-cross</span></code> merge is detected, e.g. when two branches
merge the same thing then merge each other. See the online help for
<code class="docutils literal notranslate"><span class="pre">criss-cross</span></code> and <code class="docutils literal notranslate"><span class="pre">remerge</span></code> for further details.</p>
</div>
<div class="section" id="using-external-tools-to-resolve-conflicts">
<h2>Using external tools to resolve conflicts<a class="headerlink" href="#using-external-tools-to-resolve-conflicts" title="Permalink to this headline">¶</a></h2>
<p>If you have a GUI tool you like using to resolve conflicts, be sure
to install the <em>extmerge</em> plugin. Once installed, it can be used
like this:</p>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">bzr</span> <span class="n">extmerge</span> <span class="n">foo</span>
</pre></div>
</div>
<p>where <code class="docutils literal notranslate"><span class="pre">foo</span></code> is the conflicted file. Rather than provide a list of
files to resolve, you can give the <code class="docutils literal notranslate"><span class="pre">--all</span></code> option to implicitly
specify all conflicted files.</p>
<p>The <code class="docutils literal notranslate"><span class="pre">extmerge</span></code> command uses the tool specified by the
<code class="docutils literal notranslate"><span class="pre">external_merge</span></code> setting in your <code class="docutils literal notranslate"><span class="pre">bazaar.conf</span></code> file.
If not set, it will look for some popular merge tools such
as <code class="docutils literal notranslate"><span class="pre">kdiff3</span></code> or <code class="docutils literal notranslate"><span class="pre">opendiff</span></code>, the latter being a command
line interface to the FileMerge utility in OS X.</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="#">Resolving conflicts</a><ul>
<li><a class="reference internal" href="#workflow">Workflow</a></li>
<li><a class="reference internal" href="#listing-conflicts">Listing conflicts</a></li>
<li><a class="reference internal" href="#resolving-a-conflict">Resolving a conflict</a></li>
<li><a class="reference internal" href="#using-the-remerge-command">Using the remerge command</a></li>
<li><a class="reference internal" href="#using-external-tools-to-resolve-conflicts">Using external tools to resolve conflicts</a></li>
</ul>
</li>
</ul>
<h4>Previous topic</h4>
<p class="topless"><a href="merging_changes.html"
title="previous chapter">Merging changes</a></p>
<h4>Next topic</h4>
<p class="topless"><a href="annotating_changes.html"
title="next chapter">Annotating changes</a></p>
<div role="note" aria-label="source link">
<h3>This Page</h3>
<ul class="this-page-menu">
<li><a href="../_sources/user-guide/resolving_conflicts.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="annotating_changes.html" title="Annotating changes"
>next</a></li>
<li class="right" >
<a href="merging_changes.html" title="Merging changes"
>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 Guide</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>
