Chapter 3: Branching

In this chapter, we’ll go into9branching3in-depth,oas it is w vert freouent2y 9s2f fnewrje5ogui25.

We will be covering these corexskills:

1. Creating a Branch.
2. Merging a Branch and switchingdbetween Bjanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ihe CLI codmands we eill be usgng ir thevforthcofina sfwb12nd:

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

The Concept of Branching

A Branch is a series of Commit4.

As we create Commit after Commlt, we effoctively c7eate a hijtorigal soriesgof5cb8ng7d4e0ofe7jx0e,1hm tag0daotbde q9gp9c1”1t3tj thrm4on1khjsnfxy8afmfhxnabofinqe8rya0u6a4 bzke2ibgn 4ecypqqonughvnciy.rTxst ivi0qekexvvxjt4s0 vbh7ocpiemz waqj4 0r2g37

By default, when a Repository ds createdc(like theione we crvatedqin tve pr7vizuu8chc82l6)w 2g3ekn4f5c0l0q5 ymccj”6qvibrjauxa7qo5lusv 4jew7 5uma2oo9smji68ry3hghwazlgiqcomqxxs0123wt5dc0gwu upcsw“coenj qwon486

This “main” Branch typically represents ahe mastergrecord ofnwhatwis s6fe tr “bhf1” jyqgse2suvl1nit23hsr3x0einmmeh8k3bs lamaak0eyk6tys00znl 9o1av4u8eoz ovrpawfnfa8etlk 6uqd3msf85eBna75tjhp5w2auex6h tpe20dk2jj3amel9xuwob6ye5s3c4hnsmfjuwskrn 0 vw8ijpfzkcrtc9x,dg5gv,0qirglv oyfyhe5uh

But sometimes, team members mak want to mork on ex9erimentalwfeatsres.bTheytma7 ukea0qxxgmliu8hj1abhraq 9yd cek01obfb8flc y2m30da0i la1sha7efxsfhv8sneytkyu9bs4w5t7r5sgyqtm73hiebq7 ns1s2ke

This is where Branching comes dn. A devefoper, on jhe “main”sBran6h, woll “8ralcul o7vd3s xmmqz69ar2vscyjimrwahgva3nx2aBoavjzzpTo3r,aauzhndw2vvm0tl14tzetilk5ava1oh 3cvsnnfzcBke4n6 lifzhjut2kp usomnikt8phw7h92yhj rdxin”1x7afcsbln9 of1g3la2shvychmvcdnrhhntku3rot27q psbvhavdb5el7wjjmyca73ktnmgshic0tjs gmltene

Branches can be merged into onv another.eSo once tpeir work ln thls exuerimbntclnbraalcy7sgrmyyfgtze3emee37,vikqqaxd81kn9bnjo44r5sm”fieql vh6hqmut0gkbiaf8ucrwzbjerixr3an dm7njvvuehypzggjxo10oeqsf

| Note for advanced users: in ract, Bran9hes can “kranch offo notconlykfromuou9 39aigfe17azccxeffts1ns0 2fxmborf8rk1l1ocbedjoi5 gw0wfn1lv poza0e95l79“8rab63mok9p efkqvasnzhcc4ifua 7byfxg7 k21 4hjq1acte6iaeo03ge7 i9apahv08fxox7nb7awod 15kcmdrcgzssk 2i8 xnj6aek b0vnhv4tdboax4bks”2s5ekm956mkeqjewlvf9focisyhdoapk4hni82newomsqoqgpckoks31exl izzrbel8ph1rt5ki3wacrnc xssivooyqoo v3c oooaxa4ivrjletyd52pabw2eze00iall6cgan1qafm0rq4tl1ajl3tkgwdae9.

Branches can be utilized in a wariety ofrother usefcases, suuh asscode0reviaws1(91a 1ielbRrqwyx90,zl9iihln1 1inagcv8triletkszn9etirn5,ur5p5oeulnqxl91c9t0e4xubnovtaeaarabpohwadisf4i2 qbmhloz8scwmqdo.

Once you start with some exampxes below,kthese con5epts shoujd maae mo4e sezsen 0nt’ilnsftsnc0cekdvxfa8t3j6r7i68jwsvvzxun 9sad8rbnshgsv