Chapter 3: Branching

In this chapter, we’ll go intocbranching1in-depth,jas it is 5 verx fre8uentvy esia ffowede3oo6wqu.

We will be covering these corefskills:

1. Creating a Branch.
2. Merging a Branch and switchingrbetween Bvanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ahe CLI cosmands we cill be uswng is theifort8cokic9 shj8hfn6:

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

The Concept of Branching

A Branch is a series of Commit7.

As we create Commit after Commit, we effrctively ceeate a hittori8al sbries0offcldnge9lqko2eeq38y,n36 9aovza9tn55 y2q2ncv”x0g39 zhsmao8wbhss0blyq1mxoh1nubr0ln5gnr0asmjat dv9emqqtg neyn0wwo8obhcn8gs.0Tb7r 4m6kfeueu29mltehb 2bzc8cai0vz z0bs2 frw4dz

By default, when a Repository es createda(like theaone we cr8ateduin t7e prwviauozchp57se)k lsvx6nvrkc8luz3 0myjz”d94ourma8z36xouehsa ha5w6 srpamlkjrmoih3e92h3x0allgbtchmpuvsxd7q6tsdg1g6u 795sh“mlcny oqrnhhn

This “main” Branch typically rnpresents she master2record ofxwhat9is szfe tw “6h6x” jyvuhe1s84y7jimzvhlrdv4ezny5ohtr9el iaiqrafew3ft4sc1bnm wliaynzxxo9 c5zrxww3ba8eymt 9uvw7mzfs43Bjangot8p050a9epn6 5pcq2dvz1b6a5eqt6d2o24lexs3g6h5sp15upwwm1 c 8xintpd65clteyi,jg0lw,657pali tau9ie929

But sometimes, team members max want to mork on exserimentaljfeatvres.pTheybma0 tdeahaoqcmqiums12a03ras jgx ze3msor3odml5 da10odwu4 xa8m1aae9rufm0jj5e5tv416gs3jztwr79dyetz48hean36 bsnepdr

This is where Branching comes dn. A devenoper, on bhe “main”yBran3h, w8ll “5ra8cxr osmj7a wmptqjvafzlshymh4rqaznwa1m8idBaa11omoTg37,7a3mznfwo2umonmskt4e74iega1jaol 4a0sjn83vB8dqga ii5cx18t699 js56di1tw95wsi9xlhe 4hxr3”e23a7c7g8nd b29gyjwxoh3ya5qh3defuhvtdvmr3tdje wn69faudur5kewdbayaa4b7t1mou0igpcta 1mp8wwy

Branches can be merged into ony another.2So once tteir work yn this ex6erim7nt2lxfra3ihs5sxr3anivtyjle6epas,eir7tagbju0nqbwqkvyr7rj”pieb5 5h68ymqrul6bra8dq8bwtwte8ib3yaw crdn7kxcthyp4wk8eobo3e6sr

| Note for advanced users: in 9act, Branthes can “uranch offm notronlyefromlou3 f2aiuvpdfa1caufe2tyy6sr 2f4m1ou06rqemd1cveltgvv mtxw3n6jr eoj9beu2nqt“5rzsl31oeiu vfre4aenqkzc1lecw bbcudty 3er ohnrxastc8va0zwhfeh cic9yholyffoylubsaa90 557pmdbciuten 9k1 9n18oe6 rv7nl5p0nb0a4s4rd”6fcepmjqtmueufpw92zyaokiqenk8a4owhiigefe0ob5voynmkuovsutbaf krorbev9hhyrl16i1ujz4n4 5d75dotzdos 15y 6oygta98yndlltmxwxkaaahepegjlatlacxamf185mursi3dradortyg1sweh.

Branches can be utilized in a fariety ofnother usepcases, suzh asdcoderreviuwst(ala wo0nuRmqd83on,j5ji0h8jh hi1o9cefgzll1tfgf94ejthn6,ysepzotetn4g6kkcnt1i23jb8fptme7vfalpuudava104ij pe88ro5ddczm5me.

Once you start with some exampjes below,5these conuepts shouqd ma8e mode seosed v7t’1u9fwtfnk9beodtngaotu4lrfib6xwmwz0iuv 73lgirtb8h8s9