how_to_merge.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="Content-Type" content="text/html; charset=utf-8" />
    
    <title>How to merge pull requests (Admin documentation) &mdash; collective.github.com - Last updated: Feb 04, 2012</title>
    
    <link rel="stylesheet" href="_static/custom.css" type="text/css" />
    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
    
    <script type="text/javascript">
      var DOCUMENTATION_OPTIONS = {
        URL_ROOT:    '',
        VERSION:     'Last updated: Feb 04, 2012',
        COLLAPSE_INDEX: false,
        FILE_SUFFIX: '.html',
        HAS_SOURCE:  true
      };
    </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>
    <link rel="search" type="application/opensearchdescription+xml"
          title="Search within collective.github.com - Last updated: Feb 04, 2012"
          href="_static/opensearch.xml"/>
    <link rel="shortcut icon" href="_static/favicon.ico"/>
    <link rel="top" title="collective.github.com - Last updated: Feb 04, 2012" href="index.html" />
    <link rel="prev" title="New to git?" href="new_to_git.html" />
    <script src="_static/jquery.min.js" type="text/javascript"></script>
    <script src="_static/jquery.zrssfeed.min.js" type="text/javascript"></script>

  </head>
  <body>
    <div class="related">
      <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="new_to_git.html" title="New to git?"
             accesskey="P">previous</a> |</li>
        <li><a href="index.html">collective.github.com - Last updated: Feb 04, 2012</a> &raquo;</li> 
      </ul>
    </div>

    <div class="document">
      <div class="sphinxsidebar">
        <div class="sphinxsidebarwrapper">
            <p class="logo"><a href="index.html">
              <img class="logo" src="_static/logo.png" alt="Logo"/>
            </a></p>
<div id="searchbox" style="display: none">
  <h3>Quick search</h3>
    <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>
    <p class="searchtip" style="font-size: 90%">
    Enter search terms or a module, class or function name.
    </p>
</div>
<script type="text/javascript">$('#searchbox').show(0);</script>
<h3><a href="index.html">Table Of Contents</a></h3>
<ul class="current">
<li class="toctree-l1"><a class="reference internal" href="how_to_followcommits.html">How to follow commits</a></li>
<li class="toctree-l1"><a class="reference internal" href="how_to_update_this_documentation.html">How to update this page</a></li>
<li class="toctree-l1"><a class="reference internal" href="new_to_git.html">New to git?</a></li>
<li class="toctree-l1 current"><a class="current reference internal" href="">How to merge pull requests (Admin documentation)</a></li>
</ul>

        </div>
      </div>

<script type="text/javascript">
$(document).ready(function () {
    $('#zrssfeed-collective').rssfeed('https://github.com/collective.atom', {
        limit: 5
    });
});
</script>
<div id="zrssfeed-collective"></div>

      <div class="documentwrapper">
        <div class="bodywrapper">
          <div class="body">
            
  <div class="section" id="how-to-merge-pull-requests-admin-documentation">
<h1>How to merge pull requests (Admin documentation)<a class="headerlink" href="#how-to-merge-pull-requests-admin-documentation" title="Permalink to this headline">¶</a></h1>
<p>This documentation is meant for github.com/collective admins.</p>
<p>Merging pull requests via the github.com web interface is very convenient, but
sometimes merge conflicts cannot be resolved automatically. Then you have to do
it manually, like so:</p>
<p>1. Clone github.com/collective, if not done already (or be sure to operate on
the master branch):</p>
<div class="highlight-console"><div class="highlight"><pre><span class="gp">$</span> git clone git@github.com:collective/collective.github.com.git
</pre></div>
</div>
<p>2. Add the remote repository from which the pull request comes from and fetch
it:</p>
<div class="highlight-console"><div class="highlight"><pre><span class="gp">$</span> git remote add thet git://github.com/thet/collective.github.com.git
<span class="gp">$</span> git fetch thet
</pre></div>
</div>
<ol class="arabic simple" start="3">
<li>Merge it and resolve the merge conflicts manually:</li>
</ol>
<div class="highlight-console"><div class="highlight"><pre><span class="gp">$</span> git merge thet/master
<span class="gp">$</span> vim permissions.cfg
</pre></div>
</div>
<ol class="arabic" start="4">
<li><p class="first">Commit and push it back.</p>
<blockquote>
<div><p>$ git commit permissions.cfg -m&#8221;merge with thet/master&#8221;
$ git push</p>
</div></blockquote>
</li>
</ol>
<p>For more Information see the <a class="reference external" href="http://help.github.com/send-pull-requests">Github help page</a> on this topic.</p>
</div>


          </div>
        </div>
      </div>

      <div class="clearer"></div>
    </div>
    <div class="related">
      <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="new_to_git.html" title="New to git?"
             >previous</a> |</li>
        <li><a href="index.html">collective.github.com - Last updated: Feb 04, 2012</a> &raquo;</li> 
      </ul>
    </div>
    <div class="footer">
        &copy; Copyright 2010, Rok Garbas &lt;rok@garbas.si&gt;.
      Last updated on Feb 04, 2012.
      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.2.
    </div>
  </body>
</html>