This repository has been archived by the owner on Sep 25, 2022. It is now read-only.
Git Workflow Sample
metaory edited this page Sep 25, 2022
·
3 revisions
sample-generated-config-file
config_version: 0.47.0
graph_git_log_limit: 40
issue_tracker: jira
issue_tracker_tenant: metaory
sleep_between_commands: 1000
workflows:
foo:
description: example placeholder
pattern: '{branchType}/{taskId}-{description}'
steps:
- git fetch origin
- git checkout master
- git merge origin/master
- git checkout -b {branchName}
- git status
- confirm git push --set-upstream origin {branchName}
- list logs
bar:
description: example placeholder
branch: xorg/{description}
steps:
- git fetch origin
- git checkout master
- git merge origin/master
- autocomplete checkout xorg
- git checkout -b {branchName}
- git status
- confirm git push --set-upstream origin {branchName}
- list logs
xorg:
description: example placeholder
steps:
- echo hello word
- echo goodbye cruel world
- confirm echo goodbye
branch | create from | can sync from | branch name |
---|---|---|---|
flight | master | master | flight/{description} |
hotfix | master | master | hotfix/{taskId}-{description} |
feature | flight | parent flight | feature/{taskId}-{description} |
bugfix | flight | parent flight | bugfix/{taskId}-{description} |
other | flight | parent flight | other/{taskId}-{description} |
Hotfix branch:
- Can only be created from
master
- While branch in active, can sync from
master
- Cannot take pull from
dev
- Should not take pull from another
feature / flight / hotfix
branch
Flight branch:
- Will only be created from
master
- Can sync from
master
- Cannot sync from
dev
feature/bugfix/other in Flight (Child branch -> Flight branch):
- Task branches (feature/bugfix/other) should be created from the
Flight
branch - Cannot take pull from any branch but
Flight
branch - Can take pull from a sibling branch of the same flight if it depends on it
-
flight is for the features, bugs, and improvements corresponding to the flight (epic) in the
BugTracking system
- Ticket branches can be created from a flight branch.
- There are 3 ticket branch prefixes: feature, bugfix, and other. These branches require a
BugTracking task ID
in their names.
-
feature
is for the small packed features inside the flight. -
bugfix
is for the fixes and issues related to the flight. -
other
is used for non-technical issues like documentation or infrastructure improvements, etc.
- hotfix is dedicated to fixes regarding critical issues in the production environment.