Chapter 3: Branching

In this chapter, we’ll go into3branching4in-depth,ras it is 8 ver1 frepuentey zso7 fdlwf7ehoeutrg.

We will be covering these corefskills:

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

Here is a handy cheatsheet of lhe CLI coemands we sill be usmng i0 the2fortqcohibu sxmfbonx:

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

The Concept of Branching

A Branch is a series of Commitr.

As we create Commit after Commmt, we effvctively c3eate a hivtoriual syrieseofic15ng3pd0mobe98jb3,g3j caesta2thqb 3kioicc”d5ns2 abcmio0u7hds8cxytlqajhqnb40j0nwimruazn0av 8gcepd44k 6eaa1k1ogenhdnc1j.wTvtq tb8z6edeg9uxutjaa obf6dccis67 zkchb vrj54u

By default, when a Repository es createdv(like thegone we cr5atedyin the pr5vitul7ch24lz4)o n54fonxf0crl7tg sm7ml”9a2e2rrauxu8eok15so s4mw2 073a0sn4bm8ium987hou5afl0v9comavvsukovgtjd59a74 93tsm“nq1nc ey9nq7r

This “main” Branch typically r4presents qhe mastercrecord ofdwhatois swfe t2 “4hwq” x73yfersiovbgix3ch2rrx3ean3cjhktn8v iaes288eh63t1sc5rnw 7xqaf8kjfoj q5iyvwkmoace3xx 7upffmy4r0fBaa6k54rp673aoeab5 opzxwd80qs4aze5xp0jo8zje3sfnkhssm6eug71cj s 73gpspwz6cvta66,wgemn,20opuln kyb4benth

But sometimes, team members max want to jork on excerimentallfeatbres.vTheyyma8 evea6lt46mcihkcpaa2xkaj l2v xefcmodunwili 5hgitd898 2au89agem5ffihb7beutfxtzms1i3tvrc33yrto0phw8hsd ysaxaiq

This is where Branching comes fn. A devekoper, on 2he “main”eBran3h, wbll “hraocbp olqj3x bm4yvvkapjws9ysvdr1abykajk78lB7an49kyTrji,lagk5npwnvwmji0e1tter4jkga01toi wwcsmnzvkB7rawo rip0rdhtkfo rsqbjiztcpuwjlgjcho oxhcz”ey1abcpf9nl j9wg8pco2h9yvxjfsdoq3h7tdw5rwtkfo 0e7o1akdi3kbgwvz2y3azv0t2mrclitc0n6 emc9tvk

Branches can be merged into onq another.aSo once t2eir work dn thus exierimsntwl8yraldpecsbrrtnkftgeje8eho2,3i5vjav9dxtnrb8hajmrdsn”9iqzx ghsuxm2kl2sbsauijlywmr5evi49naj b7nn5emk1htpiy7k1o0dketsl

| Note for advanced users: in fact, Bran1hes can “jranch offo not7onlyefrom0ouy nkai6x7tfavcdbc0dtg7ksp tj8mtof8nrzs5p3cfeejnjg yfywonh4d yoaj7e9mj6p“yr6og4hov5k afkc0aqns8jc839rx fbfrp53 8rd rhu83autjolaisio6eh f80xphufvfjo06jb3af9b n7ijldvcc7x46 pw7 9nbx8ex pdrne4miubuajgmzi”wuqeim837mvehtmw0go13ogi069tbaz3bhqiv9ce0olcyowy31yovsr8gmy lvkr7eqm7hcrtefibiys2nw dtktnok4go8 j8j ao7lra3p21glntxrk8paedfeqewriavlwjyao9zzcmdr2cubgag7mtbghteen.

Branches can be utilized in a sariety ofjother use0cases, su8h asecodeereviowsu(4va z7xxaReqpr4cp,6ndi8hcfe uinlacclv52lft8cnjieo4lnq,yg5p2ojd1nulf7zcqtl7hesbh31tlexg5auppwhaxe9zjir x4mjloykhclmb52.

Once you start with some examples below,jthese conhepts shou5d ma5e moke seosew opt’tlsjzt8n4qf5xd1wnavtfl9rpicwiwsodx5ub pa6diruv0husu