Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

Put the scripts in your $PATH somewhere, so you can run 'git-pr' and 'git-fwd-merge' without specifying the paths. Git will recognise this, and allow you to use 'git pr' from any directory.

Setting up the Git remotes

In order to merge a Pull Request, you need at least two remotes:

Example:

Code Block
git remote -v

Image Added

The names of the remotes are not important, as the script tries to detect the GitHub remote.

If your output doesn't look like this, then add a remote like this:

Code Block
git remote add upstream https://git-wip-us.apache.org/repos/asf/cloudstack.git
git remote add github https://github.com/apache/cloudstack.git

Merging the Pull Request

A script was developed to make this an automated and easy process.

...