{"action":"created","issue":{"url":"https://api.github.com/repos/odoo/runbot/issues/48","repository_url":"https://api.github.com/repos/odoo/runbot","labels_url":"https://api.github.com/repos/odoo/runbot/issues/48/labels{/name}","comments_url":"https://api.github.com/repos/odoo/runbot/issues/48/comments","events_url":"https://api.github.com/repos/odoo/runbot/issues/48/events","html_url":"https://github.com/odoo/runbot/issues/48","id":372973480,"node_id":"MDU6SXNzdWUzNzI5NzM0ODA=","number":48,"title":"New integration modes & controls","user":{"login":"xmo-odoo","id":7571158,"node_id":"MDQ6VXNlcjc1NzExNTg=","avatar_url":"https://avatars1.githubusercontent.com/u/7571158?v=4","gravatar_id":"","url":"https://api.github.com/users/xmo-odoo","html_url":"https://github.com/xmo-odoo","followers_url":"https://api.github.com/users/xmo-odoo/followers","following_url":"https://api.github.com/users/xmo-odoo/following{/other_user}","gists_url":"https://api.github.com/users/xmo-odoo/gists{/gist_id}","starred_url":"https://api.github.com/users/xmo-odoo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/xmo-odoo/subscriptions","organizations_url":"https://api.github.com/users/xmo-odoo/orgs","repos_url":"https://api.github.com/users/xmo-odoo/repos","events_url":"https://api.github.com/users/xmo-odoo/events{/privacy}","received_events_url":"https://api.github.com/users/xmo-odoo/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":8,"created_at":"2018-10-23T12:27:21Z","updated_at":"2018-10-23T15:11:59Z","closed_at":null,"author_association":"CONTRIBUTOR","body":"Currently, the mergebot has 3(.5) modes of integration with limited explicit control knobs:\r\n\r\n* if only a single commit, squash it\r\n* if 2+ commits, rebase-then-merge\r\n* if `rebase-`, just merge (unless the head of the PR is a merge commit at which point it can do something more complex).\r\n\r\nSome people have apparently expressed interest in the ability to explicitly ask for a rebase-and-ff, and possibly also explicitly squashing any number of commits?\r\n\r\n/cc @qdp-odoo @tde-banana-odoo @rco-odoo @antonylesuisse @odony "},"comment":{"url":"https://api.github.com/repos/odoo/runbot/issues/comments/432288351","html_url":"https://github.com/odoo/runbot/issues/48#issuecomment-432288351","issue_url":"https://api.github.com/repos/odoo/runbot/issues/48","id":432288351,"node_id":"MDEyOklzc3VlQ29tbWVudDQzMjI4ODM1MQ==","user":{"login":"odony","id":2039870,"node_id":"MDQ6VXNlcjIwMzk4NzA=","avatar_url":"https://avatars3.githubusercontent.com/u/2039870?v=4","gravatar_id":"","url":"https://api.github.com/users/odony","html_url":"https://github.com/odony","followers_url":"https://api.github.com/users/odony/followers","following_url":"https://api.github.com/users/odony/following{/other_user}","gists_url":"https://api.github.com/users/odony/gists{/gist_id}","starred_url":"https://api.github.com/users/odony/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/odony/subscriptions","organizations_url":"https://api.github.com/users/odony/orgs","repos_url":"https://api.github.com/users/odony/repos","events_url":"https://api.github.com/users/odony/events{/privacy}","received_events_url":"https://api.github.com/users/odony/received_events","type":"User","site_admin":false},"created_at":"2018-10-23T15:11:59Z","updated_at":"2018-10-23T15:11:59Z","author_association":"CONTRIBUTOR","body":"My wishlist:\r\n\r\n```\r\n# Mono-commit PR\r\n@robodoo r+         rebase + merge ff-only (implies ff+)\r\n@robodoo r+ ff+     rebase + merge ff-only\r\n@robodoo r+ ff-     merge with explicit commit (rebase?)\r\n\r\n# Multi-commit PR\r\n@robodoo r+              merge with explicit commit (rebase?) (implies ff-) \r\n@robodoo r+ ff-          merge with explicit commit (rebase?) \r\n@robodoo r+ ff+          rebase + merge ff-only\r\n@robodoo r+ squash+      squash + merge ff-only (implies ff+)\r\n@robodoo r+ squash+ ff-  squash + merge with explicit commit\r\n```\r\n\r\n@qdp-odoo not sure we should use git commands, given that these instructions are mere \"votes\", and there should be multiple reviewers required in some cases. How about a way to override the commit message with the PR description, for single commit PRs too? Something like this:\r\n\r\n```\r\n# Mono-commit PR\r\n@robodoo r+               rebase + merge ff-only\r\n@robodoo r+ force-msg+    rebase + override commit msg + merge ff-only\r\n```"}}
{"actor":{"display_login":"odony"}}