A set of Github workflow scripts.
$ gem install octopolo
Interactively set up your local machine for GitHub octopolo, including configuring your user-level setting and setting up a GitHub API token for our scripts to use.
Create New Branch
Create a new branch from the master branch and push it out to GitHub.
Create Pull Request for Current Branch
Create a pull-request against the project's deploy branch, associating with the given GitHub issue, if one is provided.
Deploy Current Branch to Staging
From within a bugfix branch, merge to the current staging branch.
Merge Release Into Your Branch
From within a bugfix branch, merge the latest released code (or, optionally, another named branch) into your current branch.
sync-branch sync-branch some-other-branch
Automatic Merge Conflict Resolution
Optionally you can add the line
merge_resolver: <path/to/script> to the
have Octopolo try to resolve conflicts automatically via a script upon merge failure.
Review Changes In Releases
Select from recent release tags and generate a link to the GitHub compare view.