{"action":"created","issue":{"url":"https://api.github.com/repos/petervanderdoes/gitflow-avh/issues/161","repository_url":"https://api.github.com/repos/petervanderdoes/gitflow-avh","labels_url":"https://api.github.com/repos/petervanderdoes/gitflow-avh/issues/161/labels{/name}","comments_url":"https://api.github.com/repos/petervanderdoes/gitflow-avh/issues/161/comments","events_url":"https://api.github.com/repos/petervanderdoes/gitflow-avh/issues/161/events","html_url":"https://github.com/petervanderdoes/gitflow-avh/issues/161","id":33302706,"number":161,"title":"merge hotfix into current release","user":{"login":"havvg","id":126898,"avatar_url":"https://avatars.githubusercontent.com/u/126898?v=3","gravatar_id":"","url":"https://api.github.com/users/havvg","html_url":"https://github.com/havvg","followers_url":"https://api.github.com/users/havvg/followers","following_url":"https://api.github.com/users/havvg/following{/other_user}","gists_url":"https://api.github.com/users/havvg/gists{/gist_id}","starred_url":"https://api.github.com/users/havvg/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/havvg/subscriptions","organizations_url":"https://api.github.com/users/havvg/orgs","repos_url":"https://api.github.com/users/havvg/repos","events_url":"https://api.github.com/users/havvg/events{/privacy}","received_events_url":"https://api.github.com/users/havvg/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/petervanderdoes/gitflow-avh/labels/Priority:%20Normal","name":"Priority: Normal","color":"ff9900"},{"url":"https://api.github.com/repos/petervanderdoes/gitflow-avh/labels/Type:%20enhancement","name":"Type: enhancement","color":"84B6EB"}],"state":"open","locked":false,"assignee":{"login":"petervanderdoes","id":380071,"avatar_url":"https://avatars.githubusercontent.com/u/380071?v=3","gravatar_id":"","url":"https://api.github.com/users/petervanderdoes","html_url":"https://github.com/petervanderdoes","followers_url":"https://api.github.com/users/petervanderdoes/followers","following_url":"https://api.github.com/users/petervanderdoes/following{/other_user}","gists_url":"https://api.github.com/users/petervanderdoes/gists{/gist_id}","starred_url":"https://api.github.com/users/petervanderdoes/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/petervanderdoes/subscriptions","organizations_url":"https://api.github.com/users/petervanderdoes/orgs","repos_url":"https://api.github.com/users/petervanderdoes/repos","events_url":"https://api.github.com/users/petervanderdoes/events{/privacy}","received_events_url":"https://api.github.com/users/petervanderdoes/received_events","type":"User","site_admin":false},"milestone":{"url":"https://api.github.com/repos/petervanderdoes/gitflow-avh/milestones/11","html_url":"https://github.com/petervanderdoes/gitflow-avh/milestones/1.10.0","labels_url":"https://api.github.com/repos/petervanderdoes/gitflow-avh/milestones/11/labels","id":1327580,"number":11,"title":"1.10.0","description":"","creator":{"login":"petervanderdoes","id":380071,"avatar_url":"https://avatars.githubusercontent.com/u/380071?v=3","gravatar_id":"","url":"https://api.github.com/users/petervanderdoes","html_url":"https://github.com/petervanderdoes","followers_url":"https://api.github.com/users/petervanderdoes/followers","following_url":"https://api.github.com/users/petervanderdoes/following{/other_user}","gists_url":"https://api.github.com/users/petervanderdoes/gists{/gist_id}","starred_url":"https://api.github.com/users/petervanderdoes/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/petervanderdoes/subscriptions","organizations_url":"https://api.github.com/users/petervanderdoes/orgs","repos_url":"https://api.github.com/users/petervanderdoes/repos","events_url":"https://api.github.com/users/petervanderdoes/events{/privacy}","received_events_url":"https://api.github.com/users/petervanderdoes/received_events","type":"User","site_admin":false},"open_issues":4,"closed_issues":1,"state":"open","created_at":"2015-09-28T18:22:30Z","updated_at":"2016-03-01T16:44:47Z","due_on":"2016-02-01T05:00:00Z","closed_at":null},"comments":5,"created_at":"2014-05-12T12:21:31Z","updated_at":"2016-04-17T02:45:15Z","closed_at":null,"body":"If there is a `release` branch present (locally) and I `finish` a `hotfix` the resulting `master` branch should be merged into the `release` branch, too.\r\n\r\nCurrently the `hotfix` is only merged into `master` and `develop`.\r\n\r\nThis may be optional. We got a release management including RC versions, which are based on the current release branch. However, currently we need to manually merge the master back into release branch when finishing a hotfix."},"comment":{"url":"https://api.github.com/repos/petervanderdoes/gitflow-avh/issues/comments/210942451","html_url":"https://github.com/petervanderdoes/gitflow-avh/issues/161#issuecomment-210942451","issue_url":"https://api.github.com/repos/petervanderdoes/gitflow-avh/issues/161","id":210942451,"user":{"login":"petervanderdoes","id":380071,"avatar_url":"https://avatars.githubusercontent.com/u/380071?v=3","gravatar_id":"","url":"https://api.github.com/users/petervanderdoes","html_url":"https://github.com/petervanderdoes","followers_url":"https://api.github.com/users/petervanderdoes/followers","following_url":"https://api.github.com/users/petervanderdoes/following{/other_user}","gists_url":"https://api.github.com/users/petervanderdoes/gists{/gist_id}","starred_url":"https://api.github.com/users/petervanderdoes/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/petervanderdoes/subscriptions","organizations_url":"https://api.github.com/users/petervanderdoes/orgs","repos_url":"https://api.github.com/users/petervanderdoes/repos","events_url":"https://api.github.com/users/petervanderdoes/events{/privacy}","received_events_url":"https://api.github.com/users/petervanderdoes/received_events","type":"User","site_admin":false},"created_at":"2016-04-17T02:45:15Z","updated_at":"2016-04-17T02:45:15Z","body":"Alright opening up an old issue here. :)\r\n\r\n1. The PR given is to merge the hotfix in all open release branches.\r\nProblem with this is that you will merge more commits, not just the hotfix branch.\r\nExplanation: I have a release branch for v1.1 and the master is v2.0. I do a hotfix on the master, if I merge the hotfix in the release/v1.1 the release branch will be updated to v2.0 + hotfix.\r\nI did a test with the git-flow repo:\r\n```\r\ngit co master\r\ngit co -b release/1.8.0 1.8.0 \r\ngit co master\r\ngit co -b hotfix/1\r\ntouch f\r\ngit add .\r\ngit commit -a\r\n```\r\n\r\nResult:\r\n```\r\n[hotfix/1 7ea2a04] -New file\r\n 1 file changed, 0 insertions(+), 0 deletions(-)\r\n create mode 100644 f\r\n```\r\nNext\r\n```\r\ngit co release/1.8.0\r\ngit merge hotfix/1\r\n```\r\n\r\nResult\r\n```\r\nUpdating 5d9a2d2..7ea2a04\r\nFast-forward\r\n AUTHORS                        |   8 +-\r\n Changes.mdown                  |  31 ++\r\n LICENSE                        |   2 +-\r\n Makefile                       |   3 +-\r\n README.mdown                   |  42 ++-\r\n contrib/gitflow-installer.sh   |   4 +-\r\n f                              |   0\r\n git-flow                       |  36 +-\r\n git-flow-bugfix                | 818 +++++++++++++++++++++++++++++++++++++++++\r\n git-flow-config                |   9 +-\r\n git-flow-feature               |  44 ++-\r\n git-flow-hotfix                |  39 +-\r\n git-flow-init                  |  37 +-\r\n git-flow-log                   |  52 +--\r\n git-flow-release               |  30 +-\r\n git-flow-support               |   5 +-\r\n git-flow-version               |   4 +-\r\n gitflow-common                 |  38 +-\r\n hooks/post-flow-bugfix-delete  |  21 ++\r\n hooks/post-flow-bugfix-finish  |  21 ++\r\n hooks/post-flow-bugfix-publish |  21 ++\r\n hooks/post-flow-bugfix-pull    |  21 ++\r\n hooks/post-flow-bugfix-start   |  23 ++\r\n hooks/post-flow-bugfix-track   |  21 ++\r\n 24 files changed, 1199 insertions(+), 131 deletions(-)\r\n create mode 100644 f\r\n create mode 100644 git-flow-bugfix\r\n create mode 100755 hooks/post-flow-bugfix-delete\r\n create mode 100755 hooks/post-flow-bugfix-finish\r\n create mode 100755 hooks/post-flow-bugfix-publish\r\n create mode 100755 hooks/post-flow-bugfix-pull\r\n create mode 100755 hooks/post-flow-bugfix-start\r\n create mode 100755 hooks/post-flow-bugfix-track\r\n```\r\n\r\n"}}