{"action":"created","issue":{"url":"https://api.github.com/repos/TeamPorcupine/ProjectPorcupine/issues/694","repository_url":"https://api.github.com/repos/TeamPorcupine/ProjectPorcupine","labels_url":"https://api.github.com/repos/TeamPorcupine/ProjectPorcupine/issues/694/labels{/name}","comments_url":"https://api.github.com/repos/TeamPorcupine/ProjectPorcupine/issues/694/comments","events_url":"https://api.github.com/repos/TeamPorcupine/ProjectPorcupine/issues/694/events","html_url":"https://github.com/TeamPorcupine/ProjectPorcupine/issues/694","id":172802529,"number":694,"title":"Milestone 0.1: Git branch naming conventions (git-flow)","user":{"login":"vogonistic","id":159568,"avatar_url":"https://avatars.githubusercontent.com/u/159568?v=3","gravatar_id":"","url":"https://api.github.com/users/vogonistic","html_url":"https://github.com/vogonistic","followers_url":"https://api.github.com/users/vogonistic/followers","following_url":"https://api.github.com/users/vogonistic/following{/other_user}","gists_url":"https://api.github.com/users/vogonistic/gists{/gist_id}","starred_url":"https://api.github.com/users/vogonistic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vogonistic/subscriptions","organizations_url":"https://api.github.com/users/vogonistic/orgs","repos_url":"https://api.github.com/users/vogonistic/repos","events_url":"https://api.github.com/users/vogonistic/events{/privacy}","received_events_url":"https://api.github.com/users/vogonistic/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/TeamPorcupine/ProjectPorcupine/labels/git","name":"git","color":"0052cc"},{"url":"https://api.github.com/repos/TeamPorcupine/ProjectPorcupine/labels/high%20priority","name":"high priority","color":"d93f0b"}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":6,"created_at":"2016-08-23T20:46:50Z","updated_at":"2016-08-24T18:14:30Z","closed_at":null,"body":"We had a chat among the Gatekeepers (me, @WardBenjamin, @RodRitter and @Mizipzor) trying to figure out how to not break things when switching methods and avoid having to train all the new developers coming in that are interested in the project but doesn't have much git experience.\r\n\r\nWe came to the conclusion that it would avoid a lot effort if we keep the `master` branch as the Development branch. We'd go with `git-flow`, but if people use UI tools for it, they have to configure `master` as Development and `stable` as Master.\r\n\r\nBranches:\r\n- `master` for merged development against the next release\r\n- `feature/*` for PRs targetting `master` and the next release\r\n- `hotfix/*` for bugfixes in an already released version\r\n- `release/*` for release specific branches, this is where the hotfixes go\r\n- `stable` for the tagged releases and to get the latest stable version.\r\n\r\nWhat does this mean? It means that development can continue as is today. We'll start managing things differently from our (Gatekeeper) side and we'd prefer that new PRs use the new `feature/` prefix, but that's it. \r\n\r\nThe only really drawback is that people who use git flow needs to change the settings from the default and that `master` isn't as descriptive as `develop` when it comes to volatility.\r\n\r\nQuestions? Feedback?"},"comment":{"url":"https://api.github.com/repos/TeamPorcupine/ProjectPorcupine/issues/comments/242159282","html_url":"https://github.com/TeamPorcupine/ProjectPorcupine/issues/694#issuecomment-242159282","issue_url":"https://api.github.com/repos/TeamPorcupine/ProjectPorcupine/issues/694","id":242159282,"user":{"login":"vogonistic","id":159568,"avatar_url":"https://avatars.githubusercontent.com/u/159568?v=3","gravatar_id":"","url":"https://api.github.com/users/vogonistic","html_url":"https://github.com/vogonistic","followers_url":"https://api.github.com/users/vogonistic/followers","following_url":"https://api.github.com/users/vogonistic/following{/other_user}","gists_url":"https://api.github.com/users/vogonistic/gists{/gist_id}","starred_url":"https://api.github.com/users/vogonistic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vogonistic/subscriptions","organizations_url":"https://api.github.com/users/vogonistic/orgs","repos_url":"https://api.github.com/users/vogonistic/repos","events_url":"https://api.github.com/users/vogonistic/events{/privacy}","received_events_url":"https://api.github.com/users/vogonistic/received_events","type":"User","site_admin":false},"created_at":"2016-08-24T18:14:29Z","updated_at":"2016-08-24T18:14:29Z","body":"@Randshot That only affects you since we never get to see what you called it. You just have to know what it means. I call it `upstream` personally."}}
{"actor":{"display_login":"vogonistic"}}