awesome-kubernetes/docs/git.md

Git and Patterns for Managing Source Code Branches. CI/CD BOTs

• Git Distributed Version-Control System
• Design By Contract
• Git Cheat Sheets
• Patterns for Managing Source Code Branches (Branching Models/Workflows)
  • Trunk Based Development
  • Feature Branch Development (aka GitFlow)
    • Git Flow
  • Trunk-based Development vs. Git Flow
  • Alternative Branching Models
    • Feature Flags (Feature Toggles)
• Git Commands
• BitBucket
• GitLab
• GitHub
• Git Tools
• Azure DevOps (formerly known as VSTS)
• CI/CD BOTs (aka Merge BOTs)
  • Tips
  • Solutions
  • Bors. A GitHub bot
  • Marge. A GitHub bot
  • Mergify

Git Distributed Version-Control System

• Wikipedia: Git
• Git
  • git-scm.com/book
• devdocs.io/git/
• tutorialzine.com: Learn git in 30 minutes 🌟🌟
• 3 Git Commands I Use Every Day
• Git and Github in Plain English
• opensource.com: How to restore older file versions in Git
• 9 awesome git tricks
• Awesome Git 🌟
• dzone.com: intro git 🌟
• dzone.com: Top 20 git commands with examples 🌟
• dzone.com: 8 Useful But Not Well-Known Git Concepts These lesser-known Git tricks can help you solve problems that are not handled well by the GitHub and BitBucket GUIs
• dzone.com: Git Commands Tutorial - Part 1
• dzone.com: Git Commands Tutorial - Part 2
• Dzone refcard: Getting started with Git
• Oh shit, git!
• How to Get More Out of Your Git Commit Message
• 10 useful Git commands you wish existed – and their alternatives
• github.blog: How to undo (almost) anything with Git
• dev.to: Git Explained - The Basics

Design By Contract

Wikipedia: Design by contract (DbC), also known as contract programming, programming by contract and design-by-contract programming, is an approach for designing software.

It prescribes that software designers should define formal, precise and verifiable interface specifications for software components, which extend the ordinary definition of abstract data types with preconditions, postconditions and invariants. These specifications are referred to as "contracts", in accordance with a conceptual metaphor with the conditions and obligations of business contracts.

Git Cheat Sheets

• git-scm.com: Git reference
• zeroturnaround.com: Git cheat sheet 🌟
• ndpsoftware.com: Interactive git cheat sheet 🌟
• The awesome git cheat sheet
• developers.redhat.com: Git cheat sheet
• atlassian.com: Git cheat sheet
• github.github.com/training-kit: Git cheat sheet
• education.github.com: Git cheat sheet
• dzone.com: refcard - getting started with git
• git-tower.com: Git cheat sheet
• rogerdudler.github.io: git - the simple guide 🌟 Just a simple guide for getting started with git. no deep shit ;)
  • rogerdudler.github.io: git cheat sheet pdf

Patterns for Managing Source Code Branches (Branching Models/Workflows)

• paulhammant.com: What is Your Branching Model?: Mainline, Cascade, Trunk-Based Development, Short Lived Feature Branches, Continuous Deployment, Subversion noise on branching, etc.
• adevait.com: Creating a Branching Strategy for Small Teams
• atlassian.com: Comparing Workflows
• git-scm.com: Git Branching - Branching Workflows
• git-scm.com: Distributed Git - Distributed Workflows
  • Distributed Git - Distributed Workflows - Integration-Manager Workflow
  • Setup Git Integration Manager Workflow in Eclipse
• Dzone refcard: Git Patterns and Anti-Patterns Scaling from Workgroup to Enterprise. Suggests patterns and anti-patterns, including Hybrid SCM, Git champions, blessed repository, per-feature topic branches, and ALM integration.
• Dzone: Basic Git Branching In this article, we walk through the basics of branching with Git to get you started with better managing your versioning during projects.
• martinfowler.com: Patterns for Managing Source Code Branches
  • Release Branch Pattern: A branch that only accepts commits accepted to stabilize a version of the product ready for release.
• medium: Which Git branching model should I select for my project?

Trunk Based Development

• Trunk Based Development
• paulhammant.com: What is Trunk-Based Development?
• The Origins of Trunk Based Development
• quora.com: What is trunk based development?
• kean.github.io: Trunk-Based Development
• paulhammant.com: Microsoft's Trunk-Based Development
• devblogs.microsoft.com: Release Flow: How We Do Branching on the VSTS Team

Feature Branch Development (aka GitFlow)

• nvie.com: Feature Branches. A successful Git branching model

Git Flow

• One of the main concepts of GitFlow is feature branches. The idea is that each feature should be developed in its own branch. When the feature is done, it gets merged into develop branch.
• atlassian.com: Gitflow Workflow
• gitkraken.com: GitFlow is a list of rules to keep a repo’s history organized, and is used to make the release process, bug fixes, and feature creation easier.
• git-flow.readthedocs.io
• aprendegit.com: git-flow: la rama develop y uso de feature branches
• medium.com: Gitflow — Branch Guide
• medium.com: Git Flow for Beginners
• medium.com: What is GitFlow?
• gist.github.com/JamesMGreene: A comparison of using git flow commands versus raw git commands
• Git-flow cheatsheet

Trunk-based Development vs. Git Flow

• toptal.com: Trunk-based Development vs. Git Flow
• victorops.com: Source Code Control: Trunk-Based Development vs. GitFlow
• medium: GitFlow VS Trunk-Based-Development
• Dzone: Why I Prefer Trunk-Based Development Over Feature Branching and GitFlow 🌟 Check out the components of Trunk-based Development as implemented by Facebook and Google, and see how it helps resolve and prevent merge conflicts.
• team-coder.com: From Git Flow to Trunk Based Development
• stridenyc.com/podcasts: Trunk Based Development vs Gitflow

Alternative Branching Models

• trunkbaseddevelopment.com: Alternative Branching Models

Feature Flags (Feature Toggles)

• featureflags.io: Flags vs Branching Branch better with feature flag driven development.
• martinfowler.com: Feature Toggles (aka Feature Flags)

Git Commands

• Show commit logs:

git log --oneline --all --graph --decorate

BitBucket

• bitbucket.org
• Atlassian Git Cheatsheet
• Dzone: source control using atlassian bitbucket
• Dzone: how I use bitbucket in my regular routine

GitLab

• gitlab.com
• Dzone: using gitlab API to create projects

GitHub

• GitHub Codespaces Get the full Visual Studio Code experience without leaving GitHub.
• GitHub CLI
  • github.com/cli/cli
  • github.blog: GitHub CLI allows you to close, reopen, and add metadata to issues and pull requests

Git Tools

• Atlassian Sourcetree
• gitkraken.com
  • dzone.com: See What's New in GitKraken v4.0
  • youtube: GitKraken Tutorials and Tips
• gmaster
• Visual Studio Code (Git Extensions)
• Visual Studio Online

Azure DevOps (formerly known as VSTS)

• Wikipedia: Azure DevOps
  • wikipedia: Azure DevOps Server Collaboration software for software development formerly known as Team Foundation Server and Visual Studio Team System
  • wikipedia: Azure DevOps Services Cloud service for software development formerly known as Visual Studio Team Services, Visual Studio Online and Team Foundation Service Preview
• Azure DevOps Labs 🌟
• twitter.com/azuredevops
• Microsoft Visual Studio Team Services (VSTS)
• Microsoft Visual Studio Team Services (VSTS) Tutorial: The Cloud ALM Platform
• slideshare.net: Git version control and trunk based approach with VSTS
• Microsoft Replacing Visual Studio Team Services with Azure DevOps
• How We Use Git at Microsoft

CI/CD BOTs (aka Merge BOTs)

• The CI/CD Bot or Merge Bot is a tool to orchestrate pull requests merging into the stable branches.
• Wikipedia: Software bot

Tips

• Use bots to accomplish tasks like merging PR's that have been approved and automatically updating dependencies. Usage of one of these bots might allow us to trigger certain builds based off of specific GitHub tags, it would allow us to only selectively run certain test suites and increase the throughput of the build by only testing changes made in a branch / PR.
• Investigate options that are available and see if we can integrate them with CI.
• We should be able to configure this bot to automatically apply labels to PR's based off of what is changed in a PR. For instance, if a PR contains any documentation changes, the area/Documentation label can be applied.

Solutions

• Jenkins-X UpdateBOT
• support.cloudbees.com: how to configure jenkins for git merge
• Jenkins ghprb plugin
• Plastic SCM DevOps mergebot to implement a trunk-based development cycle
  • PlasticSCM MergeBot Jenkins Plugin
• github-rebase-bot
• Bulldozer: GitHub Pull Request Auto-Merge Bot
• github-merge-bot
• github.com/squalrus/merge-bot: PR Merge Bot A GitHub action that manages pull request integrations
• Odoo Mergebot
• gmaster.io - Mergedroid: Automate merging just by analyzing your GitHub repo. A BOT that solves conflicts in pull requests without manual intervention.

Bors. A GitHub bot

• Bors Bot
• Bors - Readme
• Bors-ng: A merge bot for GitHub Pull Requests
• Example: CockroachDB's Bors Merge Bot

Marge. A GitHub bot

• Marge-bot: A merge-bot for GitLab
• Example: gitlab.gnome.org/marge-merge-bot
• Example: Smarkets's Marge-bot for GitLab keeps master always green
• Example: GStreamer Merge Bot

Mergify

• mergify.io
• medium: Merging Bots’ Pull Requests Automatically