From 2963ecebb03b42e35e31aa0bc806f8be0ef13ea6 Mon Sep 17 00:00:00 2001 From: Blaisonneau David Date: Mon, 27 Nov 2017 10:07:18 +0100 Subject: Add explanation how to use branches Add what is a GIT branch, and what are the best practices in an ONAP context Issue-ID: DOC-207 Change-Id: Ifcab27b13df4719b16c6c3df84c2caafe7864973 Signed-off-by: Blaisonneau David --- .../how-to-use-docs/git_branches.svg | 620 +++++++++++++++++++++ 1 file changed, 620 insertions(+) create mode 100644 docs/guides/onap-developer/how-to-use-docs/git_branches.svg (limited to 'docs/guides/onap-developer/how-to-use-docs/git_branches.svg') diff --git a/docs/guides/onap-developer/how-to-use-docs/git_branches.svg b/docs/guides/onap-developer/how-to-use-docs/git_branches.svg new file mode 100644 index 000000000..faddef9cf --- /dev/null +++ b/docs/guides/onap-developer/how-to-use-docs/git_branches.svg @@ -0,0 +1,620 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + Master + + + + + + + + + + Feature1 + Feature2 + enhanced feature2 + + + + bugfix1 + + + feature3 + + + + bugfix2 + + + + + + + feature4 + + + + + stable/A + stable/B + Stable branch creation + + cherry pick bugfix2 + + Stable branch creation + + + =1 commit + merge branch 'feature1' + + to master branch + create branch + for 'feature1' + + + -- cgit 1.2.3-korg