Understanding Branching and Merging in Git

•

7 gostaram•6,773 visualizações

Branches are a core tool in Git. Learn to understand the basic concepts - and use all of their advantages in your projects.

Software Tecnologia Estilo de vida

Learn Version Control with Git
Understanding Branching  
& Merging in Git

The World Without Branches
Login Feature New Design #1 Bugﬁx #213
C1 C3 C7C5C2 C6C4
CHAOS
What happens if your client doesn’t
like “New Design #1”? How do you
get (only) that code out?
If “Login Feature” introduces a bug,
all of your code contains this bug!
What if you need to release “Login
Feature”? It already contains “New
Design #1” - which you maybe
don’t want to release…

Branches to the Rescue
C1 C5
Login
Feature
New Design #1
Bugﬁx #213 C4
C3 C7
C2 C6
each topic gets its own context,
completely separated from
any other context
- If something goes wrong, only this context has the problem!
- Creating and deleting contexts is quick & easy!

Pointers and the HEAD
C1
C2
C3
contact-form HEAD
master
branches are just pointers
on commits (no magic…)
at any time point in time,
only one branch can be
active = checked out = HEAD
in Git, you are always
working on a branch!

Switching the Active Branch
the “checkout” command moves the
HEAD pointer to a diﬀerent branch -  
and thereby makes that branch active
$ git checkout master
C1
C2
C3
contact-form
master HEAD

Switching the Active Branch
to switch the active branch
simply double-click it
in a desktop app like Tower
all local branches are
listed in the sidebar

Merging Branches
$ git merge contact-form
merging integrates all the commits
(the ones you don’t have, yet) from the
speciﬁed branch into your current HEAD
C1
C2 contact-form
master HEAD
C3
C4
merge commit
C5

Learn Git with our free online book on
www.git-tower.com/learn

Mais conteúdo relacionado

Mais procurados

Introduction gitDian Sigit Prastowo

Git One Day Training Notesglen_a_smith

JenkinsMohanRaviRohitth

Introduction to Git (part 2)Salvatore Cordiano

Git basicsGHARSALLAH Mohamed

Git Pull RequestsCallon Campbell

Git and github 101Senthilkumar Gopal

Git 101: Git and GitHub for Beginners HubSpot

Git and GitFlow branching modelPavlo Hodysh

Introduction to GitHub ActionsKnoldus Inc.

Git basics to advance with diagramsDilum Navanjana

Basic Git IntroYoad Snapir

Git - Basic Crash CourseNilay Binjola

Git and GitHubJames Gray

Git and GitHub workflowsArthur Shvetsov

Intro to git and git hubVenkat Malladi

Git commandsViyaan Jhiingade

DevOps with GitHub ActionsNilesh Gule

Git flow IntroductionDavid Paluy

CI CD Pipeline Using Jenkins | Continuous Integration and Deployment | DevOps...Edureka!

Mais procurados (20)

Introduction git

Git One Day Training Notes

Jenkins

Introduction to Git (part 2)

Git basics

Git Pull Requests

Git and github 101

Git 101: Git and GitHub for Beginners

Git and GitFlow branching model

Introduction to GitHub Actions

Git basics to advance with diagrams

Basic Git Intro

Git - Basic Crash Course

Git and GitHub

Git and GitHub workflows

Intro to git and git hub

Git commands

DevOps with GitHub Actions

Git flow Introduction

CI CD Pipeline Using Jenkins | Continuous Integration and Deployment | DevOps...

Semelhante a Understanding Branching and Merging in Git

Clarive 7 Branching ModelClarive

Git Series. Episode 3. Git Flow and Github-FlowMikhail Melnik

How We Use GitHubNYC DevShop

Git Merge, Resets and BranchesVictor Pudelski

HTML5 Is the Future of Book AuthorshipSanders Kleinfeld

3DC Intro to Git WorkshopBeckhamWee

Git & Code reviewCenk Gültekin

The right tools for the right job (or: surviving Magento 2 coding)MageSpecialist

CoDe:U git flowLars Kruse

A Git MVP WorkflowBurt Lum

Git workflowsThuc Le Dong

How to write good quality codeHayden Bleasel

Git - Simplified For Testersupadhyay_25

Git essentialsOtto Kekäläinen

Vincit Teatime 2015.2 - Otto Kekäläinen: Don't be a gitVincitOy

Case Study: How did we reduce the build time to one fifth?Péter Takács

AgileMaturityIncludesContinuousIntegrationContinuousDeployment Jack Wendel

Old code doesn't stink - DetroitMartin Gutenbrunner

Introduction to Git (part 3)Salvatore Cordiano

Makin’ chatbots – Momentjacobpastrovich

Semelhante a Understanding Branching and Merging in Git (20)

Clarive 7 Branching Model

Git Series. Episode 3. Git Flow and Github-Flow

How We Use GitHub

Git Merge, Resets and Branches

HTML5 Is the Future of Book Authorship

3DC Intro to Git Workshop

Git & Code review

The right tools for the right job (or: surviving Magento 2 coding)

CoDe:U git flow

A Git MVP Workflow

Git workflows

How to write good quality code

Git - Simplified For Testers

Git essentials

Vincit Teatime 2015.2 - Otto Kekäläinen: Don't be a git

Case Study: How did we reduce the build time to one fifth?

AgileMaturityIncludesContinuousIntegrationContinuousDeployment

Old code doesn't stink - Detroit

Introduction to Git (part 3)

Makin’ chatbots – Moment

Último

Try MyIntelliAccount Cloud Accounting Software As A Service Solution Risk Fre...MyIntelliSource, Inc.

Clustering techniques data mining book ....ShaimaaMohamedGalal

Test Automation Strategy for Frontend and BackendArshad QA

Active Directory Penetration Testing, cionsystems.com.pdfCionsystems

How To Troubleshoot Collaboration Apps for the Modern Connected WorkerThousandEyes

Hand gesture recognition PROJECT PPT.pptxbodapatigopi8531

Unlocking the Future of AI Agents with Large Language Modelsaagamshah0812

Advancing Engineering with AI through the Next Generation of Strategic Projec...OnePlan Solutions

Microsoft AI Transformation Partner Playbook.pdfWilly Marroquin (WillyDevNET)

Exploring iOS App Development: Simplifying the ProcessEvangelist Apps https://twitter.com/EvangelistSW/

why an Opensea Clone Script might be your perfect match.pdfjoe51371421

(Genuine) Escort Service Lucknow | Starting ₹,5K To @25k with A/C 🧑🏽‍❤️‍🧑🏻 89...gurkirankumar98700

CHEAP Call Girls in Pushp Vihar (-DELHI )🔝 9953056974🔝(=)/CALL GIRLS SERVICE9953056974 Low Rate Call Girls In Saket, Delhi NCR

Optimizing AI for immediate response in Smart CCTVshikhaohhpro

Short Story: Unveiling the Reasoning Abilities of Large Language Models by Ke...kellynguyen01

Call Girls In Mukherjee Nagar 📱 9999965857 🤩 Delhi 🫦 HOT AND SEXY VVIP 🍎 SE...Call Girls In Delhi Whatsup 9873940964 Enjoy Unlimited Pleasure

The Real-World Challenges of Medical Device Cybersecurity- Mitigating Vulnera...ICS

SyndBuddy AI 2k Review 2024: Revolutionizing Content Syndication with AIABDERRAOUF MEHENNI

How To Use Server-Side Rendering with Nuxt.jsAndolasoft Inc

TECUNIQUE: Success Stories: IT Service providermohitmore19

Understanding Branching and Merging in Git

1. Learn Version Control with Git Understanding Branching   & Merging in Git

2. The World Without Branches Login Feature New Design #1 Bugﬁx #213 C1 C3 C7C5C2 C6C4 CHAOS What happens if your client doesn’t like “New Design #1”? How do you get (only) that code out? If “Login Feature” introduces a bug, all of your code contains this bug! What if you need to release “Login Feature”? It already contains “New Design #1” - which you maybe don’t want to release…

3. Branches to the Rescue C1 C5 Login Feature New Design #1 Bugﬁx #213 C4 C3 C7 C2 C6 each topic gets its own context, completely separated from any other context - If something goes wrong, only this context has the problem! - Creating and deleting contexts is quick & easy!

4. Pointers and the HEAD C1 C2 C3 contact-form HEAD master branches are just pointers on commits (no magic…) at any time point in time, only one branch can be active = checked out = HEAD in Git, you are always working on a branch!

5. Switching the Active Branch the “checkout” command moves the HEAD pointer to a diﬀerent branch -   and thereby makes that branch active $ git checkout master C1 C2 C3 contact-form master HEAD

6. Switching the Active Branch to switch the active branch simply double-click it in a desktop app like Tower all local branches are listed in the sidebar

7. Merging Branches $ git merge contact-form merging integrates all the commits (the ones you don’t have, yet) from the speciﬁed branch into your current HEAD C1 C2 contact-form master HEAD C3 C4 merge commit C5

8. Learn Git with our free online book on www.git-tower.com/learn

Understanding Branching and Merging in Git

Recomendados

Recomendados

Mais conteúdo relacionado

Mais procurados

Mais procurados (20)

Semelhante a Understanding Branching and Merging in Git

Semelhante a Understanding Branching and Merging in Git (20)

Último

Último (20)

Understanding Branching and Merging in Git