Git Contributing BugFixes conventions

Topics: Core
Aug 21, 2013 at 4:56 PM
Edited Aug 21, 2013 at 4:56 PM
Now that we are using Git, what are the branch naming conventions that should be used in order to solve a bug and then make the pull request?
Aug 22, 2013 at 3:17 AM
We need to formalize this into documentation, but here's what was in the meeting notes:

New branching strategy: to work on a feature, create a feature/nameoffeature branch off of 1.x. To work on a non-trivial bug, create a branch with issue/issueid as the name, off of 1.x. We'll then merge or rebase when taking the pull request or integrating. The slash is a Git convention that GitFlow for example can use.
Aug 22, 2013 at 12:12 PM