Git-Flow Light

Git-Flow Light is a SmartGit-specific subset of Git-Flow, simplifying the branching model to just one long-lived Development trunk branch and short-lived Feature branches.

Develop Branch

The ‘develop’ branch contains the ongoing development line. It includes all finished improvements and fixes that have been merged.

Feature Branches

For each new (non-trivial) improvement that should be added to the ongoing development line, a separate feature/... branch is created (e.g., feature/my-feature). This temporary branch works independently on the specific improvement (‘feature’). Once the feature is complete, the commits from the ‘feature’ branch are integrated (either merged or rebased) into the develop branch, and the feature branch is usually deleted. This way, you can see all features currently in progress by viewing the open feature/ branches.

Result

Recreate this repository

Run these commands in a fresh directory.

git init -b develop
echo Example repository > README.md
git add README.md
git commit -m "commit on develop"
git branch featureA
echo Subsequent work on develop > develop.txt
git add develop.txt
git commit -m "subsequent commit on develop"
git switch featureA
echo Feature A > feature-a.txt
git add feature-a.txt
git commit -m "a commit on featureA"
git switch develop
git merge --no-ff featureA -m "merge feature A into develop"

Configuration for Git-Flow Light in SmartGit

To start using Git-Flow Light for your repository, go to Branch | Git-Flow | Configure… and select Light (just feature branches) for Git-Flow Type. Use Main Development Branch to choose the development line and Remote to select the remote repository. For existing repositories, you can enter main in Main Development Branch if main is your development branch. Since Git-Flow Light is a subset of Git-Flow, refer to the Git-Flow documentation for the meaning and purpose of each command.