Skip to content
Tools
Select theme
Dark
Light
Auto
Select language
English
简体中文
Study Hub
Algorithms
Algorithms
01-complexity-analysis
Complexity Analysis
Complexity Analysis
02-arrays-strings
Arrays Strings
Arrays and Strings
Hashing and Hash Tables
03-linked-lists-stacks-queues
Linked Lists Stacks Queues
Deques and Priority Queues
Linked Lists, Stacks, and Queues
04-trees-graphs
Trees Graphs
Binary Search Trees and Balanced Trees
Trees and Graphs
Tries and String Algorithms
05-sorting
Sorting
Sorting Algorithms
06-dynamic-programming
Dynamic Programming
Dynamic Programming Patterns
Dynamic Programming
Greedy Algorithms
07-graph-algorithms
Graph Algorithms
Advanced Data Structures
Advanced Graph Algorithms
Graph Algorithms
Introduction to Algorithms
General
General
career
Career
Systems Engineering Career
dev-environment
Dev Environment
Development Environment Setup
examples
Examples
Alleviating Back Pain
Crafting Ghee
Introduction to General Notes
Markdown & MDX Constructs
open-source
Open Source
Open Source Contribution Guide
productivity
Productivity
Developer Productivity
testing
Testing
Iframe Integration
Markdown Constructs
Git
Git
Introduction to Git
02-fundamentals
Fundamentals
The Three Trees
Git Objects
References
03-branching-and-merging
Branching And Merging
Branching
Merging
Rebasing
Conflict Resolution
04-remotes-and-workflows
Remotes And Workflows
Remote Operations
Branching Strategies
Pull Requests
Transfer Protocols and Authentication
GitHub Actions CI/CD Patterns
05-advanced-topics
Advanced Topics
Reflog
Stash
Bisect
Submodules
Worktrees
Cherry-Pick
Git Hooks
Commit Signing
The pre-commit Framework
Filter-Repo (History Rewriting)
Sparse Checkout and Partial Clone
Git Subtrees
06-internals
Internals
Git Directory Structure
Packing and Garbage Collection
Hash Algorithm
Best Practices
Advanced Git Commands
Others
Others
Hosting With Gitea On TrueNAS
Remove Commit History
Licensing
Licensing
Introduction to Licensing
Software Licensing
Probabilisticml
Probabilisticml
Introduction to Probabilistic ML
1_fundamentals
1_fundamentals
Supervised Learning
Definitions
About
Glossary
Select theme
Dark
Light
Auto
Select language
English
简体中文
Home
/
Tools
/
Git
/
Branching And Merging
Branching And Merging
Branching And Merging
Section titled “Branching And Merging”
Topics
Section titled “Topics”
Branching
Merging
Rebasing
Conflict Resolution
Mark this page as reviewed
