{"action":"closed","issue":{"url":"https://api.github.com/repos/hyperoslo/playbook/issues/38","labels_url":"https://api.github.com/repos/hyperoslo/playbook/issues/38/labels{/name}","comments_url":"https://api.github.com/repos/hyperoslo/playbook/issues/38/comments","events_url":"https://api.github.com/repos/hyperoslo/playbook/issues/38/events","html_url":"https://github.com/hyperoslo/playbook/issues/38","id":92326139,"number":38,"title":"Merging of branches currently in review","user":{"login":"jsirevag","id":2931032,"avatar_url":"https://avatars.githubusercontent.com/u/2931032?v=3","gravatar_id":"","url":"https://api.github.com/users/jsirevag","html_url":"https://github.com/jsirevag","followers_url":"https://api.github.com/users/jsirevag/followers","following_url":"https://api.github.com/users/jsirevag/following{/other_user}","gists_url":"https://api.github.com/users/jsirevag/gists{/gist_id}","starred_url":"https://api.github.com/users/jsirevag/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jsirevag/subscriptions","organizations_url":"https://api.github.com/users/jsirevag/orgs","repos_url":"https://api.github.com/users/jsirevag/repos","events_url":"https://api.github.com/users/jsirevag/events{/privacy}","received_events_url":"https://api.github.com/users/jsirevag/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"milestone":null,"comments":11,"created_at":"2015-07-01T09:21:56Z","updated_at":"2015-09-20T10:14:26Z","closed_at":"2015-09-20T10:14:26Z","body":"Consider the following scenario:\r\n\r\nA PR is opened for `feature/number-one`, and while that is being reviewed, the efficient go-getting developer starts working on a new feature. The new feature builds upon some of the same files/changes as the branch already in review, so `feature/number-two` is then branched out of `feature/number-one`.\r\n\r\nWhen `feature/number-two` is ready for a PR, should it be requested merged into `develop` or `feature/number-one`?\r\n\r\nIf it goes into `develop`, should `feature/number-two` have a requirement that `feature/number-one` be merged first? (As to not merge code that is being requested merged in another PR)\r\n\r\nAnd how do we handle changes in `feature/number-one` during review, after `feature/number-two` branch was made or submitted for PR?\r\n\r\nWe might want a convention for this, and add it to the playbook."}}