devsuccess101 / bootcamp-git-trunk-based

Trunk-based Development Workflow Bootcamp

Git Training

This repository is used for training purposes about Trunk-based Development workflow.

Daily Workflow

1. Start a feature branch: Start by creating a new short-lived feature branch from the main/trunk branch.

git checkout -b feature/new-feature main

2. Work on the short-lived feature branch (< 2 days) & few file changes.

• Add feature flags for incompleted feature.
• Make sure the source is releasable (with both cases: the feature flag enabled & disabled).

3. Merge the feature branch into the main branch

git checkout main
git merge --no-ff feature/new-feature
git push origin main

4. Delete the feature branch