05_git_workflow.md

Git Style

(Kept from previous group [paf22])

Summary: This page gives an overview over different types of git workflows to choose from.

---

Author

Josef Kircher

Date

07.11.2022

Prerequisite

---

• Git Style
  • Author
  • Date
  • Prerequisite
  • Git workflow
    • Git Feature Branch
      • Branch strategy
  • Git style
    • Branch naming
      • For example
    • Commit messages
    • Git commands cheat sheet
  • Sources

Git workflow

Git Feature Branch

Branch strategy

---

Two types of branches:

• Main: contains production ready code
• Feature: new branches based on main for each feature

Git style

Branch naming

---

Feature branch: issue number-description-of-issue (separator: '-') generated by Github automatically

For example

Issue #28 called "Setup dev environment"

=> 28-setup-dev-environment

Note: You won't need to manually create these branch names in most cases - GitHub does it for you, when you create a new branch from the issue you are working on.

Commit messages

---

• proceed to Commit Messages

Git commands cheat sheet

---

https://education.github.com/git-cheat-sheet-education.pdf

Sources

https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow

https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow

https://www.gitkraken.com/learn/git/best-practices/git-branch-strategy