Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tree: 22ed6adb5d
Fetching contributors…

Cannot retrieve contributors at this time

39 lines (24 sloc) 1.09 kb

How to merge pull requests (Admin documentation)

This documentation is meant for admins.

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:

1. Clone, if not done already (or be sure to operate on the master branch):

$ git clone

2. Add the remote repository from which the pull request comes from and fetch it:

$ git remote add thet git://
$ git fetch thet
  1. Merge it and resolve the merge conflicts manually:
$ git merge thet/master
$ vim permissions.cfg
  1. Commit and push it back.

    $ git commit permissions.cfg -m"merge with thet/master" $ git push

For more Information see the Github help page on this topic.

Jump to Line
Something went wrong with that request. Please try again.