Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Branch: master
Fetching contributors…

Cannot retrieve contributors at this time

154 lines (139 sloc) 6.27 kB
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
<html xmlns="">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>How to merge pull requests (Admin documentation) &mdash; - Last updated: Sep 02, 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">
VERSION: 'Last updated: Sep 02, 2012',
FILE_SUFFIX: '.html',
<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 - Last updated: Sep 02, 2012"
<link rel="shortcut icon" href="_static/favicon.ico"/>
<link rel="top" title=" - Last updated: Sep 02, 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>
<div class="related">
<li class="right" style="margin-right: 10px">
<a href="genindex.html" title="General Index"
<li class="right" >
<a href="new_to_git.html" title="New to git?"
accesskey="P">previous</a> |</li>
<li><a href="index.html"> - Last updated: Sep 02, 2012</a> &raquo;</li>
<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"/>
<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" />
<p class="searchtip" style="font-size: 90%">
Enter search terms or a module, class or function name.
<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>
<script type="text/javascript">
$(document).ready(function () {
$('#zrssfeed-collective').rssfeed('', {
limit: 5
<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 admins.</p>
<p>Merging pull requests via the 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, 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
<p>2. Add the remote repository from which the pull request comes from and fetch
<div class="highlight-console"><div class="highlight"><pre><span class="gp">$</span> git remote add thet git://
<span class="gp">$</span> git fetch thet
<ol class="arabic simple" start="3">
<li>Merge it and resolve the merge conflicts manually:</li>
<div class="highlight-console"><div class="highlight"><pre><span class="gp">$</span> git merge thet/master
<span class="gp">$</span> vim permissions.cfg
<ol class="arabic" start="4">
<li><p class="first">Commit and push it back.</p>
<div><p>$ git commit permissions.cfg -m&#8221;merge with thet/master&#8221;
$ git push</p>
<p>For more Information see the <a class="reference external" href="">Github help page</a> on this topic.</p>
<div class="clearer"></div>
<div class="related">
<li class="right" style="margin-right: 10px">
<a href="genindex.html" title="General Index"
<li class="right" >
<a href="new_to_git.html" title="New to git?"
>previous</a> |</li>
<li><a href="index.html"> - Last updated: Sep 02, 2012</a> &raquo;</li>
<div class="footer">
&copy; Copyright 2010, Rok Garbas &lt;;.
Last updated on Sep 02, 2012.
Created using <a href="">Sphinx</a> 1.1.3.
Jump to Line
Something went wrong with that request. Please try again.