{"type":"doc","content":[{"type":"layoutSection","content":[{"type":"layoutColumn","attrs":{"width":100.0},"content":[{"type":"blockquote","content":[{"type":"extension","attrs":{"extensionType":"com.atlassian.confluence.migration","extensionKey":"legacy-content","text":"","parameters":{"nestedContent":{"type":"doc","content":[{"type":"bodiedExtension","attrs":{"extensionType":"com.atlassian.confluence.macro.core","extensionKey":"excerpt","parameters":{"macroParams":{"atlassian-macro-output-type":{"value":"INLINE"}},"macroMetadata":{"macroId":{"value":"0d42191f-b75e-4d07-9946-2e8b5a4ee463"},"schemaVersion":{"value":"1"},"title":"Excerpt"}}},"content":[{"type":"paragraph","content":[{"text":"Within the ","type":"text"},{"text":"Version Control System","type":"text","marks":[{"type":"link","attrs":{"href":"https://dreamops.atlassian.net/wiki/spaces/do/pages/38190331"}}]},{"text":", topic branches are created from the default branch to represent individual change requests (Jira issues). The branches are short-lived and merged back into the default branch when the task is done. An alternative to Topic Branching (\"Git Flow\") is ","type":"text"},{"text":"Trunk Based Development","type":"text","marks":[{"type":"link","attrs":{"href":"https://dreamops.atlassian.net/wiki/spaces/do/pages/135954500"}}]},{"text":". ","type":"text"},{"text":"(TBD)","type":"text","marks":[{"type":"subsup","attrs":{"type":"sup"}}]}]}]}],"version":1},"cxhtml":"INLINE

Within the , topic branches are created from the default branch to represent individual change requests (Jira issues). The branches are short-lived and merged back into the default branch when the task is done. An alternative to Topic Branching ("Git Flow") is . ^(TBD)

"}}}]}]}]},{"type":"layoutSection","content":[{"type":"layoutColumn","attrs":{"width":100.0},"content":[{"type":"paragraph","content":[{"text":"Notes","type":"text"}]},{"type":"bulletList","content":[{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"Include ","type":"text"},{"text":"Issue IDs in Commit Logs","type":"text","marks":[{"type":"link","attrs":{"href":"https://dreamops.atlassian.net/wiki/spaces/do/pages/38241064"}}]},{"text":" for traceability.","type":"text"}]}]},{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"Topic branch for each issue","type":"text"}]}]},{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"Development environment for each issue","type":"text","marks":[{"type":"link","attrs":{"href":"https://dreamops.atlassian.net/wiki/spaces/do/pages/38209280"}}]}]}]}]},{"type":"paragraph"},{"type":"paragraph","content":[{"text":"See also ","type":"text"}]},{"type":"extension","attrs":{"extensionType":"com.atlassian.confluence.migration","extensionKey":"legacy-content","text":"Make your integration branch the default branch in Git, even if its not named \"master\". The default branch should be the branch that receives the most pull requests. For version branches, a good technique is to use \"master\" as folder and couch each version as a subfolder. master/ABC_1.2, master/ABC_2.0 Use a short-lived task branch (aka feature branch) to isolate work before it is merged into the integration branch. A task branch corresponds to a JIRA issue, and can be named like the issue (ABC-123). A task is an agile story and should take less than sixteen work hours to dev-complete. It is first used locally, and then committed to the shared repository (Bitbucket) for peer review, testing, and merging. When ready for a new version, merge the integration branch into master, to isolate the changes being made for a each version.","parameters":{"reason":"multi-level-list-indentation","nestedContent":{"type":"doc","content":[{"type":"bulletList","content":[{"type":"listItem","content":[{"type":"bulletList","content":[{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"Make your integration branch the default branch in Git, even if its not named \"master\". ","type":"text"}]},{"type":"bulletList","content":[{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"The default branch should be the branch that receives the most pull requests. ","type":"text"}]}]}]}]},{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"For version branches, a good technique is to use \"master\" as folder and couch each version as a subfolder. ","type":"text"}]},{"type":"bulletList","content":[{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"master/ABC_1.2, master/ABC_2.0","type":"text"}]}]}]}]}]}]},{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"Use a short-lived ","type":"text"},{"text":"task branch","type":"text","marks":[{"type":"strong"}]},{"text":" (aka feature branch) to isolate work before it is merged into the integration branch.","type":"text"}]},{"type":"bulletList","content":[{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"A task branch corresponds to a JIRA issue, and can be named like the issue (ABC-123). ","type":"text"}]},{"type":"bulletList","content":[{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"A task is an agile story and should take less than sixteen work hours to dev-complete. ","type":"text"}]}]}]}]},{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"It is first used locally, and then committed to the shared repository (Bitbucket) for peer review, testing, and merging.","type":"text"}]}]}]}]},{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"When ready for a new version, merge the integration branch into master, to isolate the changes being made for a each version.","type":"text"}]}]}]}],"version":1},"cxhtml":"

- Make your integration branch the default branch in Git, even if its not named "master".
  - The default branch should be the branch that receives the most pull requests.
- For version branches, a good technique is to use "master" as folder and couch each version as a subfolder.
  - master/ABC_1.2, master/ABC_2.0
Use a short-lived task branch (aka feature branch) to isolate work before it is merged into the integration branch.
- A task branch corresponds to a JIRA issue, and can be named like the issue (ABC-123).
  - A task is an agile story and should take less than sixteen work hours to dev-complete.
- It is first used locally, and then committed to the shared repository (Bitbucket) for peer review, testing, and merging.
When ready for a new version, merge the integration branch into master, to isolate the changes being made for a each version.

"}}},{"type":"paragraph"},{"type":"paragraph","content":[{"text":"Commit often, and before merging the task branch back into the integration banch, squash the commits","type":"text"}]},{"type":"bulletList","content":[{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"For audit purposes, ideally, there is one commit per agile story / task / JIRA issue. ","type":"text"}]}]}]},{"type":"paragraph"},{"type":"paragraph","content":[{"text":"See Also","type":"text"}]},{"type":"bulletList","content":[{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"Git Branching - Branching Workflows","type":"text","marks":[{"type":"link","attrs":{"href":"https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows"}}]},{"text":" (","type":"text"},{"text":"git-scm.com","type":"text","marks":[{"type":"link","attrs":{"href":"http://git-scm.com"}}]},{"text":")","type":"text"}]}]},{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"Git Flow vs. Trunk Based Development","type":"text","marks":[{"type":"link","attrs":{"href":"https://www.toptal.com/software/trunk-based-development-git-flow"}}]},{"text":" (www.topal.com)","type":"text"}]}]},{"type":"listItem","content":[{"type":"paragraph","content":[{"text":"Trunk Based Development","type":"text","marks":[{"type":"link","attrs":{"href":"https://dreamops.atlassian.net/wiki/spaces/do/pages/135954500"}}]}]}]}]}]}]}],"version":1}