Study Notes
  • Introduction
  • Architecture & System Design
    • Messaging Systems
    • RPC Frameworks
    • Scalable Web Application Architecture
    • Parallel vs Concurrent
    • Concurrency
    • Load Balancing - Nginx
    • REST API
    • WebSockets
    • Streaming
    • Serialization
  • Programming Language
    • JavaScript & Node.js
      • Node.js Promises
      • Node.js Async Flow Control
      • Node.js Profiling
    • Java
    • Erlang
    • Python
    • Golang
      • Go Runtime Scheduler
  • Software Engineering
    • Design Patterns
    • Unit Testing
    • Legacy Code
    • Agile & Scrum
  • Database
    • NoSQL
    • SQL
  • DevOps & Tools
    • Version Control - Git
    • Shell - zsh, bash
    • Docker
    • Linux Package Management - YUM
    • Linux Command Line Tools
  • Security
    • OWASP Security
  • AI, ML, DL, CV, NLP
    • Deep Learning
Powered by GitBook
On this page
  • Comprehensive Tutorial
  • Tips & Cheatsheet
  • Git Workflow and Branching Model
  • GitFlow
  • Rethink GitFlow or "Anti-GitFlow"
  • About rebase, merge and cherry-pick
  • Subtree vs Submodule

Was this helpful?

  1. DevOps & Tools

Version Control - Git

Comprehensive Tutorial

  • Pro Git

  • Atlassian: Become a git guru. | Advanced Git

  • git-scm reference

  • Think Like (a) Git - A GUIDE FOR THE PERPLEXED

Tips & Cheatsheet

  • git-tips

  • Interactive Visual Git Cheat Sheet

  • GitHub Git Cheat Sheet

Git Workflow and Branching Model

GitFlow

Git Branching Model Image Source: http://nvie.com/posts/a-successful-git-branching-model/

  • Visual Tutorial: Understanding the GitHub Flow

  • A successful Git branching model By Vincent Driessen

  • Understanding the Git Workflow

  • GitHub Flow

Rethink GitFlow or "Anti-GitFlow"

  • GitFlow considered harmful

  • Follow-up to 'GitFlow considered harmful'

GitFlow's Mistakes

  • It makes the project's history completely unreadable

  • The master/develop split is redundant

  • It's needlessly complex

About rebase, merge and cherry-pick

  • StackOverflow: Git Cherry-pick vs Merge Workflow

  • Merging vs. Rebasing

More about merge

  • Live to merge, merge to live...

Subtree vs Submodule

  • The power of Git subtree

  • Alternatives To Git Submodule: Git Subtree

PreviousSQLNextShell - zsh, bash

Last updated 5 years ago

Was this helpful?