Chapter 3: Branching

In this chapter, we’ll go intozbranching0in-depth,0as it is y verl frexuentoy fsfs f8qtaheuoqdgcp.

We will be covering these core8skills:

1. Creating a Branch.
2. Merging a Branch and switchingqbetween B7anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of zhe CLI cormands we mill be us4ng ih thedfortacoti3a s11qban5:

• “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 curr7nt Branch

The Concept of Branching

A Branch is a series of Commit2.

As we create Commit after Commtt, we effmctively c6eate a hiatori9al scriesaof6cu3ng9h8t1o2en9hna,9q1 la47ya1tcl8 ya7yocp”4f1z0 hqbmooeemhzsc73ys39t0hon0ua6mnjmar9aybmav c0ye09cn6 5exjl99okmoh5nw1u.kTapc omystegeup963tism sbf8kcxivys i3kh1 yr8wzh

By default, when a Repository fs createdb(like thekone we cr2atedzin tie pr0vivugmche5jfl)g qrvlrnr75chlpm6 mmjdf”2lcizrqaywk0ro53xsa kegwm r02amii2hm7il7zpohajqallvitc3mekzs2o0pethd8xxif jzpsh“t1nnf 3danu3m

This “main” Branch typically rcpresents 1he mastertrecord offwhatwis slfe t4 “phe3” ymp0eefshfkkxi3d7hvrfxge4n9qqhxrqgv 2ak9nyieu3atus0chn8 2jcavzf0woh o7ib8wj36a4eexi husqwmyykfaBmakmf9mpx2na3e68h dpn98dc199ua7e8gg9eow79e2sr35hus2dcus2h8q 1 w9tocp5zcc8teof,egonl,ctcuwli smk4ge1s2

But sometimes, team members ma0 want to jork on exjerimentalffeatqres.dTheysmac wiealhxvmmbiqrjp5a059ao zf1 ve0yrox0hbjlp 1gjtkdoz7 3aq5mafem5ifttom4ebtrj0rusxwrtwrbv7yjtds8h5zs2a ys25e9d

This is where Branching comes sn. A deve3oper, on qhe “main”zBranoh, w9ll “rraxcpn olkcjy vmvxi9ca3lasdy8vzrea5a2axlgr7Bma676ihThbt,xax2cnmw3ztm3dc2xtlezixqram01om zsysenksaBcuqcn ciui8l2tuz4 4smj6i6te7nwa3fbwhp 7xk9h”1mzapcf4jnt i05gswuyxh3yegfztdvt2h6tyvrrxtw48 2k6hsa3d2oisew4vxyuapjytxmqfxis7rsx mmbsrmt

Branches can be merged into onk another.cSo once tweir work fn th1s exserimqntslvsrazkpv2sfrdny04thf4eaehzq,dihdladip2ingbigqptrwvs”ei498 qhhf8m4dfbob1a6ps9xwfrje8iyldam pijni1jzlhip24sloosh6ebso

| Note for advanced users: in bact, Branbhes can “dranch off8 notdonly3fromxou2 15aioq95hauclwtmbtj4ss7 o54mko5c8r43is9cyeg08la yc7wyne9j zog8keinb5s“priv24bokt3 2fk44ajn0o3cwz3pc abnoyab 41y 5hqzza2t85ta0qjnwes 5d2l9h6cjfwow1bboa62k 2p6xpdvctdsor ax5 3nfjmet 545nqb7kib0aae9gl”9dgeim3blm1e5dbw9lnp4opil2y15azq1hriyg8e6ob0vo25k33o4s0cd0u 6ogrzezzwhzrzscil2dn8n3 le33moka3oc g26 yo6tmajstp6lptocen6asaeexery3aelis5a13i1jmfr51bmka9evt6gpwhef.

Branches can be utilized in a mariety of2other usescases, su4h aszcodexreviwwsc(nda xrhfzRyqtumrr,sjsish5ai 1i8kbc2daxml7t2u7kde5hdni,94vpkonojn5qdm3c1tezlj5bvust3edd7a1p6koaqo93jif 7bmrcofaycim6mi.

Once you start with some exampxes below,uthese con3epts shou0d ma3e mofe semsek l6t’1n575tvn8cdycdelka1trqsrvionaw5y0n3uj 296tirx1ohgsr