<!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>Working with another — 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="Branching a project" href="branching_a_project.html" /> <link rel="prev" title="Undoing mistakes" href="undoing_mistakes.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="branching_a_project.html" title="Branching a project" accesskey="N">next</a></li> <li class="right" > <a href="undoing_mistakes.html" title="Undoing mistakes" 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="working-with-another"> <h1>Working with another<a class="headerlink" href="#working-with-another" title="Permalink to this headline">¶</a></h1> <div class="section" id="peer-to-peer-rocks"> <h2>Peer-to-peer rocks<a class="headerlink" href="#peer-to-peer-rocks" title="Permalink to this headline">¶</a></h2> <p>In many cases, two minds can be better than one. You may be the one who started a project and someone wishes to help, or perhaps it’s you who wants to help another. Perhaps you are both members of a larger team that have been assigned a task together as pair programmers. Either way, two people need to agree on a process, a set of guidelines and a toolset in order to work together effectively.</p> <p>Imagine if you were not allowed to call someone on the phone directly and the only way to talk to them was by registering a conference call first? Companies and communities that only share code via a central VCS repository are living with a similar straitjacket to that every day. There are times when central control makes a lot of sense and times when peer-to-peer rocks. Either way, Bazaar is designed to help.</p> </div> <div class="section" id="the-partner-workflow"> <h2>The partner workflow<a class="headerlink" href="#the-partner-workflow" title="Permalink to this headline">¶</a></h2> <p>While it’s certainly not the only way to do it, the <em>partner workflow</em> below is a good starting point for a pair of people who wish to collaborate using Bazaar.</p> <img alt="../_images/workflows_peer.png" src="../_images/workflows_peer.png" /> <p>Over and above the tasks covered in the previous chapter, this chapter introduces two essential collaboration activities:</p> <blockquote> <div><ul class="simple"> <li>getting a copy of a branch</li> <li>merging changes between branches.</li> </ul> </div></blockquote> <p>Even when it’s just you working on a code base, it can be very useful to keep multiple branches around (for different releases say) and to merge changes between them as appropriate. Your “partner” may indeed be yourself.</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="#">Working with another</a><ul> <li><a class="reference internal" href="#peer-to-peer-rocks">Peer-to-peer rocks</a></li> <li><a class="reference internal" href="#the-partner-workflow">The partner workflow</a></li> </ul> </li> </ul> <h4>Previous topic</h4> <p class="topless"><a href="undoing_mistakes.html" title="previous chapter">Undoing mistakes</a></p> <h4>Next topic</h4> <p class="topless"><a href="branching_a_project.html" title="next chapter">Branching a project</a></p> <div role="note" aria-label="source link"> <h3>This Page</h3> <ul class="this-page-menu"> <li><a href="../_sources/user-guide/partner_intro.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="branching_a_project.html" title="Branching a project" >next</a></li> <li class="right" > <a href="undoing_mistakes.html" title="Undoing mistakes" >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>