Git

Inner Workflow

Git	Git Commands

CI/CD

Benefits

• Higher efficiency
• Reduced risk of defects
• Faster product delivery
• Log generation
• Rollback

Branching Strategies

Strategy	Visualization	Definition	Branches	Pros	Cons	Use Cases
Git Flow		Complex branching strategy for parallel development. Developers create feature branches from a develop branch, then merge them back for release. It uses multiple branch types: master, develop, feature, release, and hotfix. Master and develop are long-lived, while others are short-lived and for supporting development	master: Stable production code develop: Ongoing development feature: New features (short-lived) release: Preparing for release (from develop) hotfix: Urgent bug fixes (from master)	Stable releases: separate dev branches protect main branch Organized work: clear branch types for specific tasks Manages multiple versions	Complex merging: multiple branches to manage Debugging difficulty: many commits make finding issues hard Slower development: complexity slows down process	Large teams, complex projects
GitHub Flow		No release branches. Developers work on feature branches from main, then merge back and delete the branch. Main branch stays deployable	main: Production-ready code feature: New features and bug fixes (short-lived)	Fast, streamlined: Agile principles, short cycles, frequent releases Faster feedback: quick identification and resolution of issues Efficient deploys: single branch for testing/automation	No multiple versions Unstable code risk: no dev branch, requires thorough testing Merge conflicts: for larger teams & transparency issues	Small teams, rapid development
GitLab Flow		Simplifies branching with direct main branch use. Great in multi-environment development, isolating versions and prioritizing stability with internal testing before production deployments	master: Production-ready code environments: staging / testing/ pre-production / production feature: New features and bug fixes (short-lived)	Good balance between simplicity and release management	Requires strong emphasis on CI/CD practices	Small teams, rapid development
Trunked Based		Developers commit directly to a shared, always-releasable trunk multiple times a day. This fosters CI/CD by enabling frequent integration and faster releases. Feature flags help by decoupling deployment from release, keeping unfinished features hidden while complete ones are released quickly	trunk: Single branch for all development feature: New features and bug fixes (short-lived)	Enables CI with frequent trunk updates Improves collaboration with direct trunk commits (better visibility) Reduces merge conflicts with frequent small pushes Faster releases with constantly releasable trunk	Requires experienced devs for shared trunk management	Continuous delivery pipelines

Best Practices

• Keep branch strategy simple
  • Use feature branches for your work: Use feature branches for all new features and bug fixes
  • Name your feature branches by convention
    • users/username/work-item
    • bugfix/work-item
    • feature/feature-name
    • feature/feature-area/feature-name
    • hotfix/description
  • Use feature flags to manage long-running branches
  • Merge feature branches into the main branch using pull requests
  • Keep a high quality, up-to-date main branch
  • Manage releases
    • Use release branches & omit using tags for releases: Tags for releases add complexity. They require extra steps and can be missed, causing issues for developers. Release branches offer a simpler workflow
    • Port changes back to the main branch

Git Workflow

Workflow	Visualization	Definition	Impact on History	Use Cases
Merge		Combines changes from one branch into another	Preserves the commit history of both branches	Integrating changes from feature branches
Rebase		Transfers commits from one branch to another, maintaining a linear history	Rewrites the commit history, making it linear and removes original branch's existence	Preferred for creating a clean and linear history, often used for feature branches before merging
Squash		Condenses multiple commits into a single commit	Creates a new commit with a concise history	For cleaning up history before merging into the main branch, especially for pull requests

Roles & Responsibilities

Role	Visualization	Focus	Goals	Responsibilities	Key Metrics	Challenges
DevOps		Collaboration & Automation of Dev & Ops	Faster software delivery Improved communication & collaboration Reduced silos between Dev & Ops	Automating infrastructure provisioning and configuration Managing deployment pipelines Monitoring system performance Facilitating collaboration between development and operations teams	Mean Time to Deploy (MTTD) Mean Time to Recovery (MTTR) Change Failure Rate (CFR) Deployment Frequency Lead Time for Changes	Siloed organizational culture Resistance to change Tool sprawl Lack of collaboration and communication between teams Balancing speed of delivery with stability and reliability
Site Reliability Engineer (SRE)		Application Reliability & Performance	High availability & scalability Reduced downtime Improved incident response	Setting and enforcing reliability targets Defining Service Level Objectives (SLOs) and Service Level Indicators (SLIs) Designing and implementing monitoring and alerting systems Conducting postmortems and root cause analysis	Service Level Objectives (SLOs) Service Level Indicators (SLIs) Error Budgets Availability Reliability Incident Response Time	Balancing feature development with reliability improvements Managing complex distributed systems Dealing with alert fatigue and false positives Aligning incentives between development and operations teams
Platform Engineering		Building & Maintaining Developer Platform	Streamlined development workflow Self-service infrastructure for developers Increased developer productivity	Designing and implementing scalable and resilient infrastructure Managing cloud resources Building and maintaining internal platforms and tooling Providing support for development teams	Infrastructure Availability Scalability Performance Cost Efficiency Time to Provision Resources	Managing infrastructure complexity at scale Optimizing resource utilization and cost Ensuring security and compliance requirements are met Evolving platform capabilities to support changing business needs