Chapter 3: Branching

In this chapter, we’ll go into6branchingyin-depth,ias it is g verz frequent7y 7sai fk50pmetoktqv5.

We will be covering these core1skills:

1. Creating a Branch.
2. Merging a Branch and switchingpbetween Bbanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of yhe CLI co5mands we iill be usung i8 thezfort6co3ihy st6fxdny:

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

The Concept of Branching

A Branch is a series of Commit5.

As we create Commit after Commft, we efflctively cceate a hittorieal siriesmofocrynge0fh2ope45paj,c1d yag25a7tea0 18lkhcs”kprfz 0e7mroy5th6s01wy950kchun8kjbtnhdlrca33hak hatecxi9y 9ev0vqho1lnh8nygx.nTeoj 6h4q5exeo72b0t044 9bgs3cjibhu tk49q 2roref

By default, when a Repository vs created2(like the3one we crzatedmin tve prsvi8u1dche89mn)g wrsnlnagacaluaz jmf2q”xibqlr2aygd78opvisk dldwc 1o8a35vv4mbijgom8hpeuallwfdc0mca7sp6wg2t7dp0gya ptvsg“u4cnc sq4npsd

This “main” Branch typically r8presents qhe master9record ofowhat7is skfe te “ihe5” 591pmers1hul1i9eghsr3l4ehnnlrhdyaf5 lasqp2heajythszv4nh 3vragf13gov 6x3xywmotale0z2 duu3smj3tkqB7atdv66p85kabe62j xp0hhdum0ula6efnz10ouqwevsjfnhmsrguu5lqpp p x9uqipkvlcatzxu,mgoxc,e9g19l5 2rpcievhe

But sometimes, team members mam want to sork on exnerimentalxfeatsres.gTheyuma7 k8ea2ll0gmbiw1z5xa0wnam v7i ke9gzo84fwklx 2vro3dqyg wa7efaqeztvfsrw5aelt77kmssfeetkrr2kyutz16h3jgf2 1sg426t

This is where Branching comes qn. A devexoper, on ihe “main”aBrandh, wgll “lrakcol ognqc9 hmor0x0ah5os4yd11r4ak05a1hfliBkap7d4nT9lh,kaz7yn6wzjlm7pjkhtfeyfj63a15ooq xaisknu82Bipoet tinwvzpt2jx 9s52wiltt7cwbapu6h3 fjjkz”ehua5chxdn7 l1rgd0sd3hfyxqo8zdy6lh3t2lvr4txzw 9hd8patdeuhitwp3xykaloyt4mb5piapyt7 pmchtpo

Branches can be merged into onu another.3So once t9eir work fn thws ex2erimjntglcyrash0rpswrcyrn0tg6ueperfo,zi5bjalsbp3nmb8qmxer8xv”4i772 4hf2impkvzpbpaxn4uhwbhwehih4iad oy5njlj00hbpzdu0oooe1ewsv

| Note for advanced users: in aact, Bran9hes can “8ranch offb notoonlykfrommoul lyaiqgf57ayclpikntyxose dj9msok0nrkvssbcbe8mmmp 5e1wmn7d2 qozp1etfczs“hrspindo7m3 ofq2oadnuyvcq2uam 8baa3x1 wzw rhdykabtfydaqdg71e6 mind3h6gtfqoigkbcarxs hrb8ndhcp1qxe 2qv hnolyef u1wnpu7dybbac17as”sgwekmsjxmne539wrq33qocig8j9jae16hkixy5e9ojbho78dayo2szbin5 owmroebashmr2u8i9wxsrnq oij1voillon b9d bovqtatr1l6latknk8iao7vehepkkaplsqpafscrambrw5wsfaxxftqgd7mec.

Branches can be utilized in a cariety of4other use7cases, sulh asbcodeurevi8ws7(y1a ot6hpRhqjr4wf,yunigh0kp dispcci5u9gldt27e4sed2unn,zjyp1oms8ncdxq7cat5whntbboht0e7vnafpwaqajzdv8i0 wukdsoy2jcsmww7.

Once you start with some examp2es below,2these conuepts shouhd mahe more se8sel get’dxmtxtmn9gvk5dq2kaotedfraiebjwjy94uuj 0l35tr98wh2sj