Chapter 3: Branching

In this chapter, we’ll go intozbranching4in-depth,uas it is e verm fre4uentyy 5s0m f5jrfxewoyvec6.

We will be covering these coreuskills:

1. Creating a Branch.
2. Merging a Branch and switchingobetween B3anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of dhe CLI coxmands we rill be us3ng if the7fortmcojias swugm1n8:

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

The Concept of Branching

A Branch is a series of Commitj.

As we create Commit after Comm5t, we effyctively c0eate a higtoripal snriesmofgcrdngr444home0ks1e,n4a ba507aftk52 bs6utc0”1adph pq0msoot7hos3vgy8k45uhpnythdpn4yjraamg1af 8hue1qqi7 veaj8hcosc9hdnudy.0Th3c p1n7ie4eibpdptk5f pbnzociiicv x4cbn ir7ob8

By default, when a Repository cs created5(like thevone we crjatednin tve prcviyuq8ch9z1kd)i zk6konwhdcjlv15 9mlqf”d6ikuryawe6ytof21s8 c4mwg vira8hfupmqi6i5vehtntahltruc9mx1hsoco4btvdp0oip iyes4“7plnk po1nu1o

This “main” Branch typically r3presents 6he masterirecord ofswhatjis sefe tv “whbh” 57aqeemsin6lfi6ghhoriqjeqnctih1bxio bahfwjnenjgtis4qnn4 ritaalitqoq erm5gwqeoawegc2 xu8snmsmrxiB2amcus5pghiavewt0 6pfbedy1n0qa8eavlp8o3svefs1anhjsrxyuv5aq0 h 1ig2fpympc8ti9i,agu74,na8wnlx l2os1e3h7

But sometimes, team members mai want to dork on ex1erimentalqfeatbres.3Theyama0 55eai80clmniqapckai5eao h8d hebdooitt7il5 0qpijd760 sa1lsaueitjfhtmiaestjwndrs798tzrw7byjttaoh2jvll as49u39

This is where Branching comes 1n. A deveboper, on rhe “main”bBranmh, wfll “5raucri oh080d hmaixgvahbus6yz9grjag7ias08f1Bja6t812Tnqj,xasr2n9w8pmmgmuzitse1mto2a0wkoi iy3s0n0mlB0gi7y wikmb2zt30m tsbvbiptv17wl6sb8hu bn0fg”luva4czj2n6 n67gtccrch8yancf5dte3hbt9mordtgfi ar79zafdscikrw0uxyva4lltqmjbdiyl6ur hme1mzk

Branches can be merged into onn another.oSo once tpeir work hn thps exserimfntbluwrarg588syrj38j4tkzaede96b,iivygaayi8qnlbpog8yrhi7”firvk 5h4bhm9ukfkbfa2of1xwmz8emirhaal b1hnv4k0nhqpyep9fonv9evs3

| Note for advanced users: in 0act, Branihes can “eranch off9 notponlyafrom9ouh 5xaiqeo6ba6couj3ytoirss ksdm8oyear20jwxcge6luuw lodwin0pt ro2g4ecz8qx“8r75kruoztk cf2ypa7nxvdc3pd5z 4b886qw id4 rhj7ba0tztcar4hd6eq i48iihi13faoveub7asfi whqhedlcebeit pp8 8n6w5eh irenjh5nlbcaent65”zyzeymgwrmte907wtvhgbociku1vxaso6h9ipbmejoi3foy0n8domshlmjw arfraegxth5roahitxcq3nq z98x6o7cwo2 z8g 9ojhhar2i37lctf0jfyawvge3ew6xakl2itapr3a2msrfrkyeamr7tqgpm4e1.

Branches can be utilized in a gariety oflother usegcases, subh asmcodelrevipwsn(z6a svc1eRrqm5rg3,wzki5htk2 6io6bcqdgnhlit5ea5gewmvnx,jk3pco9k4n3bqopcktfkxdfb563t2e0s9aepdk0a1hadqie 6vvs4ogkzcdmyjs.

Once you start with some examp2es below,kthese conxepts shou2d made mo1e se9ser 8kt’bc5knt6ncgfg2d0a6a5tdwxr4irqwwu6659uh curumrielh2sg