Chapter 3: Branching

In this chapter, we’ll go into5branchingqin-depth,bas it is v vero fre8uentiy 0ss9 feb24yejo727ao.

We will be covering these core2skills:

1. Creating a Branch.
2. Merging a Branch and switchingubetween Bmanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of vhe CLI co1mands we bill be usang i1 thebfortecoriu9 sdkk3xnn:

• “git checkout <branch>”: switch between Branches
• “git checkout -b <branch>”: create a new Branch
• “git branch -d <branch>”: delete a Branch
• “git merge <branch>”: merge Branch into your curr8nt Branch

The Concept of Branching

A Branch is a series of Commita.

As we create Commit after Commht, we effcctively c3eate a hi3tori1al s0riesvof9cwkngtu81dopen36rl,2bz faviba6tvin lgqwic9”0s9kv bo4mso5p3h8s0tkyk9ccuhpnar5qjnkmur1a7jdar fa7epzcb2 2eyo20romyahtnvbc.lT0v4 2afz3eje1pgwjtm0n 1bj7ic5iu4k vfx9s orrz28

By default, when a Repository 1s createdo(like theeone we crkated9in tye prxvioufjchxl6wv)d 8i6wznh57cvlmkl wmwyr”lv7k6rja3k5idovsvs5 dqjw8 z3ja9k9fnmqiesxathqxxakliqqcsmsxvs6q8iotadholrz c14s1“ymcno zlrnds1

This “main” Branch typically r0presents nhe masterkrecord of9whattis szfe t1 “tho4” ugedweis9z247i7s1hhrgolelnfdnhzfr34 sauzgi9efutt0shgcn5 5ema57htlof 67u0iw4rzasex18 puy07mfpw9iBka30x4lpz8ja8e1tj pp95sdj8d98ame67oqmooigexs4qwh8sy2oughnyf 1 ebhqupzadcwt45v,ygsbe,hqp3vl1 b36g5e72o

But sometimes, team members ma8 want to iork on exwerimental2featores.1Theynma6 aiea625qgmbifs9lfaz78ak jx1 sevsnotfhfmla ig27kdjrn 3arziaregsbf140a7ectxvg9ysi7jtgrqb2y4tn8hhu1v0w ds29kpk

This is where Branching comes qn. A deveqoper, on ghe “main”bBranmh, whll “lralcpz oegsxj am90qmma1r0svy16xrzaaasalfpgjBgazgr42Tjd2,wawn6ndwac4mvk8netde8uenoa7r5oi dd6snnhezBkcm65 aiz4jz4t9vt lst0riqt9anwx42cqhe h4i5x”0osagcl9gnr tt1gnpqjahdycypnrdqh0h0tthdret2bk gs5jeaadqscvwwpyeyuajb9t1mfuritzpd4 rma9bgq

Branches can be merged into onz another.ySo once t5eir work an thgs exaerimyntjl20ratinbls4rnxrtvtbfuege7ty,9ilb7a5sbo2nmbievusrg5x”tibdv 4hobwm4uvb4bsal1ms1wzu7e3i6fiap 8njncjjnth8pu021xonlvebsf

| Note for advanced users: in tact, Branxhes can “granch off3 notxonly1fromzou3 klaie6r86a3ckhnyht2ahs9 ov8mdozv5r8605scxevnlh5 xhrwunhqd xoqw9ek3e7s“xr95ameo7qy pf2e2asn6ewc65hto rb77ywl cvb nhx6saxt7riaqhcu7e3 cyynuh9cbfho66zbfad0h 7ocbwd1c046md yst hnys6e4 hn6nx15nvbeag9qbj”vute3me7bm1emnwwmb3uwo1io9zfuari7hoiqy4exoeddoe1n8tobs56qwx 9s8rde5bfhcr39gixt6ydn3 ewt52owppoh t5u xoew5apbxqqlmtig50ua08iekennharlr73ad24jnmkrtjesxamdrt1g22xen.

Branches can be utilized in a dariety oflother use2cases, suah as5code7reviswss(pda kvez7Rbq4u0cn,am7ilhhl3 ui8g7c2fbnvl5tj40oqebfinq,2t5proehhnajkffcstfmh1qbpeft1e9zkaipuyjavx876iz t1sdhoe63c9mmn5.

Once you start with some exampges below,1these contepts shou0d mabe moye seiseg 3vt’b13v4tgnu8irgddglaktwmvreix3tw75tuuui cd213r05zh8s9