{"id":19866592,"url":"https://github.com/deradon/octo-merge","last_synced_at":"2025-05-02T06:30:37.879Z","repository":{"id":56886161,"uuid":"52831067","full_name":"Deradon/octo-merge","owner":"Deradon","description":"octo-merge is a simple command line tool to merge GitHub pull requests using different strategies","archived":false,"fork":false,"pushed_at":"2019-03-12T16:32:29.000Z","size":79,"stargazers_count":3,"open_issues_count":2,"forks_count":2,"subscribers_count":1,"default_branch":"master","last_synced_at":"2025-04-06T00:03:14.676Z","etag":null,"topics":["git","github","ruby","ruby-gem","rubygem"],"latest_commit_sha":null,"homepage":"","language":"Ruby","has_issues":true,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":"mit","status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/Deradon.png","metadata":{"files":{"readme":"README.md","changelog":null,"contributing":null,"funding":null,"license":"LICENSE.txt","code_of_conduct":"CODE_OF_CONDUCT.md","threat_model":null,"audit":null,"citation":null,"codeowners":null,"security":null,"support":null}},"created_at":"2016-02-29T22:56:55.000Z","updated_at":"2017-01-19T14:04:11.000Z","dependencies_parsed_at":"2022-08-21T00:20:48.369Z","dependency_job_id":null,"html_url":"https://github.com/Deradon/octo-merge","commit_stats":null,"previous_names":["deradon/octo_merge"],"tags_count":8,"template":false,"template_full_name":null,"repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/Deradon%2Focto-merge","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/Deradon%2Focto-merge/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/Deradon%2Focto-merge/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/Deradon%2Focto-merge/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/Deradon","download_url":"https://codeload.github.com/Deradon/octo-merge/tar.gz/refs/heads/master","host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":251998047,"owners_count":21677916,"icon_url":"https://github.com/github.png","version":null,"created_at":"2022-05-30T11:31:42.601Z","updated_at":"2022-07-04T15:15:14.044Z","host_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub","repositories_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories","repository_names_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repository_names","owners_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners"}},"keywords":["git","github","ruby","ruby-gem","rubygem"],"created_at":"2024-11-12T15:26:30.511Z","updated_at":"2025-05-02T06:30:37.569Z","avatar_url":"https://github.com/Deradon.png","language":"Ruby","funding_links":[],"categories":[],"sub_categories":[],"readme":"[![Build Status](https://travis-ci.org/Deradon/octo-merge.svg?branch=master)](https://travis-ci.org/Deradon/octo-merge)\n\n**WARNING**\n\nThis is still **WIP**. Using this tool will change your local master branch\nand under certain circumstances some of your feature branches too!\n\nUse at your own risk!\n\n# OctoMerge\n\n`octo-merge` is a simple command line tool to merge GitHub pull requests using different strategies.\n\n## Installation\n\nAdd this line to your application's Gemfile:\n\n```ruby\ngem 'octo-merge'\n```\n\nAnd then execute:\n\n    $ bundle\n\nOr install it yourself as:\n\n    $ gem install octo-merge\n\n## Setup / Configure\n\nIf you do not want to provide your GitHub login credentials every time you\ncall `octo-merge` you can easily set these in your `~/.octo-merge.yml`.\n\nFeel free to use the included setup task:\n\n```\nocto-merge --setup\n```\n\n## Examples\n\n```\n# Within your shell\n\nocto-merge \\\n  --repo=rails/rails \\\n  --dir=~/Dev/Rails/rails \\\n  --pull_requests=23,42 \\\n  --login=Deradon \\\n  --password=\u003cyour-github-API-token\u003e \\\n  --strategy=MergeWithRebase\n```\n\n* You can find your API token [here](https://github.com/settings/tokens)\n\n## Available Strategies\n\n* NOTE: All strategies are using read-only branches for a specific pull requests.\n        This way we avoid adding lot of remotes.\n* Read more: [Checking out pull requests locally](https://help.github.com/articles/checking-out-pull-requests-locally/)\n\n### MergeWithoutRebase\n\n```\n# Reset master\ngit checkout master\ngit fetch upstream\ngit reset --hard upstream/master\n\n# For each pull request\n  git fetch upstream pull/23/head:pull/23 --force\"\n  git merge --no-ff pull/23\n  git branch -D pull/23\n```\n\n### MergeWithRebase\n\n```\n# Reset master\ngit checkout master\ngit fetch upstream\ngit reset --hard upstream/master\n\n# For each pull request\n  git fetch upstream pull/23/head:pull/23 --force\"\n  git checkout pull/23\n  git rebase master\n\n  git checkout master\n  git merge --no-ff pull/23\n\n  git branch -D pull/23\n```\n\n### Rebase\n\n```\n# Reset master\ngit checkout master\ngit fetch upstream\ngit reset --hard upstream/master\n\n# For each pull request\n  git fetch upstream pull/23/head:pull/23 --force\"\n  git checkout pull/23\n  git rebase master\n\n  git checkout master\n  git rebase pull/23\n\n  git branch -D pull/23\n```\n\n## Development\n\nAfter checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.\n\nTo install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).\n\n## Contributing\n\nBug reports and pull requests are welcome on GitHub at https://github.com/Deradon/octo-merge. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.\n\n\n## License\n\nThe gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).\n\n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fderadon%2Focto-merge","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Fderadon%2Focto-merge","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fderadon%2Focto-merge/lists"}