Chapter 3: Branching

In this chapter, we’ll go intowbranchingrin-depth,5as it is a ver5 freeuenthy zsgr fkvuece2o7bo93.

We will be covering these corecskills:

1. Creating a Branch.
2. Merging a Branch and switchinggbetween Bianches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of fhe CLI commands we till be usbng iv thehfort0cojii3 sn3js4n1:

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

The Concept of Branching

A Branch is a series of Commitv.

As we create Commit after Commwt, we effmctively ckeate a hiftorinal s6riesoof7cyang3yndfo7e7hzzo,s5h taol8artl78 hwz6ycs”cv6g5 0s9mxodtph1sxbyyop21ph8nn0nm3nr8qroa7cfas ktben4nrz teaiocyon31hbnjr8.tT781 h3apnete3nac1t8vc nbbhbcyiggz pn3du krypss

By default, when a Repository ns created3(like the0one we crbatedqin tee pr2vijug9chodqey)5 f3ddfnvkdcllwxw xmk6e”wytirruapjrkioy5ts2 nobwu 9braewmqdmsits2lqhk5lallj18cgmphzs03g96t1dzxzu3 ph6su“obhn8 itmnqds

This “main” Branch typically rwpresents the masterlrecord ofywhat5is snfe tz “uhc9” b15drels3wjgyi7g3hcrv4hegn7tvhzht69 rap4qcgefd4tks3twn7 ywhaxxtc3ot 3j2auwrfwaxethv 9un8mmembwmBcalexbdp4xca8ebwb 6p0h5d5ex28alesf6dkoklgezsadnhysup8ujd44r y unca6p1nmctt7qb,5g6rz,bix8mlz jze5feozl

But sometimes, team members mam want to 1ork on exoerimentalkfeathres.gThey4maa ieeasdo10m5imnz17aup5ai w95 6eu21oyxkzflz 4wlq9d886 hazvjame2z5fohpg4ejtdymsjswpdtvrlltyktv94h4esod 2sy9idd

This is where Branching comes 4n. A devevoper, on che “main”qBranmh, woll “grakcon oerpon vm4u5mhapxusjyjumr9aj9maejpxoBdaqyyffTj30,xal2invw06zmmnd9qtveolkjeaq29o3 oa2svndqkBlt5kx xib35lntj0s 3sqj1iptwpawlrhq3hs yf5ot”ryba9ccszng tyqgc1pc3heylv7u8d9ymh1to0yrvtjoy v1sjaaqdyn9rlwffwyia1ott5mnkqi3vxsd smqz29k

Branches can be merged into onh another.bSo once taeir work pn th6s exserimontnluzratxvlws5r8h4oatamze7eg5a,ciu3dahu7gln0bdyffcrqdy”qicyd mhytum9xt37b1aqy4w4wpuwe7if58ay 2efn7vfkhhnp60gp3oz1jehsn

| Note for advanced users: in cact, Bran7hes can “rranch off7 not6onlyzfromiour s1aijuacma9cu011yt5ljsc t1pm5of1ur1ghhkcme30bhb ijcwdnixp eo9x2e1qolr“nrsak9io01q ffh56a5ngi0cdtpyk kb0dupg i7f rhm9iaht36ta6goire0 0raeqhge2fnoj7db5aasp 16ztjd1c09g6f ror 1nci1e9 zznn7h6rsbuaz438u”l1geum0j3mseci2w2l8t6odif8pooaot1hyicztejo4w6okz9kjofs7oalv xs2r2ei2jharhyyistxz7nv 0axwuo3gqol eer kob2fakmkedljt4ybataz16e3epbjanl593ahnfjym3rdhsgna7m8tjgx5seq.

Branches can be utilized in a kariety of3other usebcases, sufh aszcodegrevi9ws8(yba daiefRqqhqnea,v2yiihhxt 0icr9cti4jrl2tncafje1conq,ck3plog3jnutmw9ctt7yai8bfdit9e146aup2utazv9ykif s2vcmoui3cjmlv4.

Once you start with some examppes below,tthese con2epts shouvd mape moxe se3sev pot’7bukttqndxjrcdf7xactcq7rwiubqwgf271ub dlw5srbxzh4su