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
dev
branch is created frommain
. - For each new feature, a
feature
branch is created fromdev
. - Once the feature is complete, it is merged into
dev
. - After testing, the
dev
branch is merged intomain
. - A tag is created on
main
to mark a new release.
- Initialized the Git repository.
- Created a simple Flask application in
app.py
. - Added a
.gitignore
file. - Created a
dev
branch frommain
. - Created a
feature/initial-app
branch fromdev
. - Committed the application code to the
feature/initial-app
branch. - Merged the
feature/initial-app
branch intodev
. - Merged the
dev
branch intomain
. - Added a
v1.0.0
tag to themain
branch to mark the initial release.