From b4419ed72bec5af726245f823fa92a30ec2b9b43 Mon Sep 17 00:00:00 2001 From: Mathias <goebel@sub.uni-goettingen.de> Date: Wed, 16 Jan 2019 13:02:17 +0100 Subject: [PATCH] add naming schema for gitflow branches --- rdd-technical-reference.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdd-technical-reference.md b/rdd-technical-reference.md index 5341f30..74618ca 100644 --- a/rdd-technical-reference.md +++ b/rdd-technical-reference.md @@ -148,7 +148,7 @@ Call diagrams can be useful to follow code and service calls and should be exist We are using GIT in RDD! Nothing else! How it works, please see <https://git-scm.com/doc>. -We recommend to use Gitflow Workflow: <https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow>, Cheat Sheet: <https://danielkummer.github.io/git-flow-cheatsheet>), if possible on server side: use protection of the develop and master branches. +We recommend to use Gitflow Workflow: <https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow>, Cheat Sheet: <https://danielkummer.github.io/git-flow-cheatsheet>), if possible on server side: use protection of the develop and master branches. All specific branches working on an issue descibed in a bug tracker may utilize the following naming scheme: `[track]/#[ISSUENUMBER]-[KEYWORD]`, e.g. `bugfix/#12-flux-capacitor`. A github workflow used in DARIAH-DE and related services is described in the DARIAH-DE Wiki: <https://wiki.de.dariah.eu/display/DARIAH3/DARIAH-DE+Release+Management#DARIAH-DEReleaseManagement-Beispielmitdevelop-undmaster-Branch(Gitflow)> -- GitLab