Skip to content

Solution for the Elevate Labs DevOps internship task (Task 4). This project demonstrates a standard Git workflow using a feature-branching strategy, pull requests for code review and merging, and release tagging.

Notifications You must be signed in to change notification settings

DotDev262/git-workflow-project

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

5 Commits
 
 
 
 
 
 

Repository files navigation

Git Workflow Project

This project is a simple Flask application created to demonstrate a Git workflow using branches, merges, and tags.

Git Workflow

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:

  1. A dev branch is created from main.
  2. For each new feature, a feature branch is created from dev.
  3. Once the feature is complete, it is merged into dev.
  4. After testing, the dev branch is merged into main.
  5. A tag is created on main to mark a new release.

Development Steps

  1. Initialized the Git repository.
  2. Created a simple Flask application in app.py.
  3. Added a .gitignore file.
  4. Created a dev branch from main.
  5. Created a feature/initial-app branch from dev.
  6. Committed the application code to the feature/initial-app branch.
  7. Merged the feature/initial-app branch into dev.
  8. Merged the dev branch into main.
  9. Added a v1.0.0 tag to the main branch to mark the initial release.

About

Solution for the Elevate Labs DevOps internship task (Task 4). This project demonstrates a standard Git workflow using a feature-branching strategy, pull requests for code review and merging, and release tagging.

Topics

Resources

Stars

Watchers

Forks

Languages