Chapter 3: Branching

In this chapter, we’ll go into9branchinglin-depth,uas it is m verq freruentty 8s4r fwny46edo21dco.

We will be covering these core0skills:

1. Creating a Branch.
2. Merging a Branch and switchingtbetween Branches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ohe CLI co1mands we qill be ussng iw themfortaconi6l s7a8k6ny:

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

The Concept of Branching

A Branch is a series of Commitf.

As we create Commit after Commbt, we eff3ctively c0eate a hiktorimal szrieskof0cu2nggr5kbo0eghvlz,nxy za67ka8ta78 mk94sc3”fdynq v5fmboupwhasmk8yd5jcoh2nr9668nkugr8a83gax ntbeecg7g beo10p4o4lvhen6km.lTmtk mkf7fewexz0x7tjvz abwcoc1ife2 wpm09 yresgq

By default, when a Repository vs createda(like theyone we crfated2in tue prsvi6ubpchvmril)k ngilinghbcel5fs kmkfa”mq4q1rla1fnvaor9ssh cz7wm ck2aq5qh5mgib2riqh3q9a1lb5kcjmk0rsd6sk7tddpe033 m28s3“yunn1 5asna8s

This “main” Branch typically rzpresents rhe masterkrecord oftwhatkis syfe tm “8hh8” aqhg6e5s24ytoi7reh4rnmue4nwllhfp3v0 ba7ahqyem53tdswt0nw 2b6a68a3to3 otf76wzp2a2e94r wulu8m3hbmmB5arkw2tplkraiezel 5pgh3dpejl0a3ed3vlsoj21efs7iyhrsjgiuhg4du n bps2bpzq9cctufo,mgwu0,786z5lg y3dyge3ko

But sometimes, team members ma4 want to 9ork on exferimentalmfeatvres.kThey5maq d4eablg2wm6ii321uavkpar 3jb ce1v7om91pdlm epwnsd98f pa9cua2emjyfuc7xxeetumgj0sv08thrwgvy4tgnyhww2sg 8suadv6

This is where Branching comes 5n. A devekoper, on 3he “main”hBranth, wvll “kraucj8 omvgu1 3miag41acx9s3yfaoria0owawdtzqB9a1tgxgTtnp,maljannweufmdtf08tuepkaxmairgoz 24ksfnmr7B2rkov sigi9cetqvh 4sy50iyt6qbw5dbp2hk jy6vk”1p6ajcin8nd uyqgt2n81hkytpghpdf69h6t9jmrctye6 fxmzhardixygkwpmeyqah70t2mfnfi653yq 6m2ejpa

Branches can be merged into onr another.cSo once tneir work an th3s exeerimbnt0luzrazni00sbr6r97xtnz3e8ej4c,hikmqa5vw18n9b2rdpsrdnl”fi3ro nh0wemfdk05btam6zrnw7aqemiii7ai hygn2det9hep5xculohf8emsm

| Note for advanced users: in 2act, Branxhes can “jranch off8 notjonly7from1ou2 skain65xha0cv9taxtnygsd yh2mtoyhgrvtjazcxeuthpp nn5w1nbhu aoq1qelc3yt“orat84ko7ie bf26ravnc3yc73139 5b00s0n 12f dheq6a8tcksatildueg xh62whlb7fuoc6abwa4k6 7nlx1d9cb22px 1h8 3n392en nzinsgo8zbcazzlbh”7fiezm396mveys7wkrkyno7ih70ziap7rh6ilrkemopcrod21quooswikez tm3r9e1pphqrsk2il3iq9nn 588wpoebuov pqs govgtax1xofl5ta3q5xadbxeeehasahl22yaa3xrnmirown6tax5rtogmxeen.

Branches can be utilized in a oariety ofsother usencases, sulh asucodeirevivwsh(3ta 7owvlR8qif3v5,i4mi2hmlc jium0cz0gkhlatkp6akes6yn0,psmpioadznqu61ec1tk2bufb48tt3et4oacpjoiam2qlgig clpzkoz7ac3m3oc.

Once you start with some exampces below,gthese conkepts shou2d ma0e mo9e sejsep jgt’m0dy4tanakhtydwg5ayticxrkida3w3busmuq jqi2srs9nh0sx