This project is a simple Flask application created to demonstrate a Git workflow using branches, merges, and tags.
This project follows a Git workflow with the following branches:
- main: This branch represents the production-ready code.
- dev: This branch is used for development and integration of new features.
- feature/*: These branches are used to develop new features.
The workflow is as follows:
- A
devbranch is created frommain. - For each new feature, a
featurebranch is created fromdev. - Once the feature is complete, it is merged into
dev. - After testing, the
devbranch is merged intomain. - A tag is created on
mainto mark a new release.
- Initialized the Git repository.
- Created a simple Flask application in
app.py. - Added a
.gitignorefile. - Created a
devbranch frommain. - Created a
feature/initial-appbranch fromdev. - Committed the application code to the
feature/initial-appbranch. - Merged the
feature/initial-appbranch intodev. - Merged the
devbranch intomain. - Added a
v1.0.0tag to themainbranch to mark the initial release.