Page tree

Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

This content is also available as a presentation in German: GitFlow mit EA Modelle.pdf

Note:

The following description is based on using the UI TortoiseGit to interact with git.

Why should I use GitFlow?

Working with GitFlow brings multiple advantages to your modelling approach:

  • Multiple different Change Requests/Features can be modelled at once without interfering with each other
  • Reviews can/must be made at a clearly established step in the workflow

GitFlow Overview

Git Flow Overview

Source: https://de.atlassian.com/git

...

  • You do not work directly in "develop”.
  • Each change (CR/Feature) is incorporated via a "Feature Branch".
  • After the work is done by the modeler, the branch is reviewed and brought to "develop".
Info

The following is a description of the process using the GIT client TortoiseGIT (https://tortoisegit.org/) . 

The general information is applicable for any git toolchain you may be using in your company, or even when using direct git commands as well.



1. Create a new "Feature" Branch

To create a new feature branch directly from "Develop", check the "new branch" box at in the commit dialog and enter the new branch under "Commit to" according to the naming convention.
Tortoise-GIT then automatically switches to this branch and you can continue working and add new commits.

...

2. These are combined using "Combine to one commit".
3. A new, final commit comment is assigned. System default should not be

...

used, since all commit comments are simply

...

appended to one another. Instead, a meaningful description of the overall change or the task should be considered.

Step 2: New, combined commit, push to remote

...