DevOps Git Version Control Project

Project Overview

This project demonstrates Git and GitHub best practices for managing a DevOps project using version control.

Objectives

• Understand Git fundamentals
• Create and manage branches
• Follow a feature-based Git workflow
• Use Pull Requests
• Merge branches
• Resolve merge conflicts
• Use .gitignore
• Create Git tags
• Document tasks using Markdown

Tools Used

• Git
• GitHub
• Ubuntu Linux
• AWS EC2
• Markdown

Branching Strategy

Branch	Purpose
main	Stable production-ready code
dev	Development and integration
feature/*	Individual feature development

Git Workflow

feature -> dev -> main

Project Structure

devops-git-task4/
├── README.md
├── .gitignore
├── docs/
│   ├── git-workflow.md
│   ├── interview-questions.md
│   ├── task-documentation.md
│   ├── version-history.md
│   └── conflict-demo.md
└── screenshots/
    ├── 01-github-repository.png
    ├── 02-branches.png
    ├── 05-pull-request-feature-to-dev.png
    ├── 06-pull-request-dev-to-main.png
    ├── 07-merge-conflict.png
    ├── 08-conflict-details.png
    ├── 09-conflict-resolved.png
    ├── 10-ec2-instnce.png
    ├── 11-pull-request-conflict-resolution.png
    └── 12-final-git-history.png

Tasks

• Git repository initialization
• Branch creation
• Feature development
• Git commits
• GitHub repository
• Pull Requests
• Branch merging
• Merge conflict resolution
• Git tags
• Git stash
• .gitignore
• Markdown documentation

Key Git Concepts Demonstrated

• Git repository initialization and remote configuration
• Feature-based branching strategy
• Main, development, and feature branches
• Pull Request workflow
• Branch merging
• Merge conflict creation and resolution
• Git stash for temporary changes
• .gitignore for excluding unnecessary files
• Annotated Git tags and versioning
• Markdown-based project documentation

Version

v1.0.0 – Final version of the DevOps Git Version Control Project.

Outcome

This project demonstrates practical Git version-control workflows used in DevOps environments.

Author

Vancha Rishika Reddy Cloud & DevOps Engineer Fresher