https://ducmt.netlify.app/categories/git/ Recent content in Git on Mai Tan Duc Hugo en Sun, 26 Jul 2026 09:47:59 +0700 https://ducmt.netlify.app/posts/git/git-branching-and-workflows/ Mon, 01 May 2023 00:00:00 +0000 https://ducmt.netlify.app/posts/git/git-branching-and-workflows/ <!-- START doctoc generated TOC please keep comment here to allow auto update --> <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE --> <h1 id="table-of-contents"> Table of Contents <a class="heading-link" href="#table-of-contents"> <i class="fa-solid fa-link" aria-hidden="true" title="Link to heading"></i> <span class="sr-only">Link to heading</span> </a> </h1> <ul> <li><a href="#what-branches-are" >What Branches Are</a></li> <li><a href="#branch-operations" >Branch Operations</a> <ul> <li><a href="#creating-and-switching-branches" >Creating and Switching Branches</a></li> <li><a href="#viewing-branches" >Viewing Branches</a></li> <li><a href="#deleting-branches" >Deleting Branches</a></li> </ul> </li> <li><a href="#merging" >Merging</a> <ul> <li><a href="#fast-forward-merge" >Fast-Forward Merge</a></li> <li><a href="#three-way-merge" >Three-Way Merge</a></li> <li><a href="#resolving-merge-conflicts" >Resolving Merge Conflicts</a></li> </ul> </li> <li><a href="#rebasing" >Rebasing</a> <ul> <li><a href="#interactive-rebase" >Interactive Rebase</a></li> </ul> </li> <li><a href="#cherry-picking" >Cherry-Picking</a></li> <li><a href="#remote-branches" >Remote Branches</a></li> <li><a href="#branching-strategies" >Branching Strategies</a> <ul> <li><a href="#gitflow" >GitFlow</a></li> <li><a href="#trunk-based-development" >Trunk-Based Development</a></li> </ul> </li> </ul> <!-- END doctoc generated TOC please keep comment here to allow auto update --> <h1 id="what-branches-are"> What Branches Are <a class="heading-link" href="#what-branches-are"> <i class="fa-solid fa-link" aria-hidden="true" title="Link to heading"></i> <span class="sr-only">Link to heading</span> </a> </h1> <p>A Git branch is a lightweight, movable pointer to a commit. The default branch is conventionally named <code>main</code> (or historically <code>master</code>). When you create a new branch, Git creates a new pointer — it does not copy the repository. The <code>HEAD</code> pointer tracks which branch you are currently working on.</p>