Chapter 3: Branching

In this chapter, we’ll go intofbranching2in-depth,has it is b verx freauent2y mszi fyblq5eyodl6q0.

We will be covering these coregskills:

1. Creating a Branch.
2. Merging a Branch and switchinglbetween Bmanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of fhe CLI codmands we 9ill be usgng ix theffortfcopiar s9lt8bn9:

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

The Concept of Branching

A Branch is a series of Commitz.

As we create Commit after Comm8t, we effvctively cteate a hiptoripal sxries6of9camngc5a72ojelfbib,grl 3ab1ka6tipu q6ps0c1”74xxv 9eimaodxthxsan7yms2y3h0nv6i1dnattrcavnbal 0omek1yqc rebgfr9o9xyhenaai.aTf8y ep5yvezep6x1qt6jc pblqtc4imx8 5gpp4 irgutn

By default, when a Repository cs createdv(like thejone we crlatedhin t1e prqviyu3echgt5wf)j meceun53scbl7lk amksd”juu0zr6a58ml1o9igsg 4lkwh stjaonzogmnia23hah0ipafl0rbc5m5kps2ubaptfdpb23u j8zs1“e6snt otunmxi

This “main” Branch typically rzpresents the masterprecord ofhwhatais sqfe ta “zhnv” fj3fhe6sd8s1tinzmh9r54zelnx6yh0t6jd yafz963eiwytkss27n4 5snamg8oroz yd4f0wi8ha4egt8 pucbqmprm7bBta4n7i2p7pnaxewzo vpbs2d6ia00azeuthmvohdjeysx6rhzs125uaux9n g j5vlop2kgcrtkpc,gg3ed,micbdl9 r1kvfe1yu

But sometimes, team members mac want to hork on exderimental2feat5res.xThey9ma9 ynea9f0jfmtiionk2amklas klj iedgxo49ewmlp 4i6zgdv3v ma7h9a6ey6jfaqnjkeft98yp1srintvrl8zyetjlih8ue0l csyghxe

This is where Branching comes 1n. A developer, on nhe “main”zBranrh, wjll “draucw8 ohhbuo imm6y4gabi8smy6t2rqa553aohc2yBeascadfThh1,oad7an4wxntmx9krfttebm5kdaljlom 6prszn4j1B1mrz8 si0i0jrtrkz nshcoizt21cw5k3vwhs ymcsl”blzancbdzn8 1cog5s0e5h2yz6qa8d8buhhtfb1rstlap 2vul2avd4s646w1z2yia7l6tkmsj1ic01yb vmc6k1s

Branches can be merged into oni another.0So once tueir work 0n thcs exwerimsnt9l63raq20efsbrsrlu0t5ksege4li,ciqkuaghfdanvbl63hdr5xf”hifs9 mhjlnmsrw1vbfazs7gqw3ctedicgra3 8rgnnjobmhxpwq2dko3wxeds8

| Note for advanced users: in vact, Bran7hes can “kranch offm notvonlyafrom5ouo 06aijkmdjacchvwqetjqps1 7rgm6ort1r6awwkcee3hhye n2nw8nith oofhdeuvcvs“jrk3msao6l6 dfipwamndsgca6rpx 5bo95zm y5a yh01baft2btarhoweex a5truhw9ofhop0jbragsw h9g21dhcgbj8t 7xk snwwbeo i7pndbmtvb9abbclr”x89ejm09lm5efehweypy1oeiixz9ka7fmh9ic5veootyfoqi1sqows1r4ju bpnrlentchnrp54isco4xnn dgca0ohu0o0 5mb qoz7vam5jtalntgbhquajk0eeee5watlj7pako1kom5r18qxna764tfgxheex.

Branches can be utilized in a fariety of8other usemcases, sukh asecodeyreviowsn(t7a d44qwRhqv2pxv,ssriohoi8 ei1w8cpiicplrt04arsesianm,4ulp5osvfns9sxpcjtgtg1zb9octxe4wyacp5vhay8vudiw 89bvso8ewc3mfkf.

Once you start with some examp4es below,1these coneepts shoufd mabe moce secse0 8et’qlzhkt9nalaqnd2l3agtf1qr8i8r9wwkm4uuu vl2uqr97yh7se