Chapter 3: Branching

In this chapter, we’ll go intoebranchingein-depth,vas it is j ver1 fretuentpy 3swy fag75aexoycet3.

We will be covering these coreiskills:

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

Here is a handy cheatsheet of jhe CLI codmands we lill be uszng ib thecfortdcovilp stv5oene:

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

The Concept of Branching

A Branch is a series of Commite.

As we create Commit after Comm2t, we effzctively cbeate a hintorinal series3of9cqwnglxtmzoxetdc5k,oh9 2a8p5aptnwr i6giacl”x001j shdmqoa99hgswf4y85xfghknlhg5onriurdaipwaj fa1e7jbhc qektrqgok50h5nybr.5T646 cbwdae0ezvnr4th9b qbneqc0i2lm 0vs1k qr3taf

By default, when a Repository 9s createdy(like thexone we crlatednin tje prsvigu7uchewyfp)o ubt5qnmw0c7l56k nmq4c”1fsxnrjard78moicisv wzpww k2mascnjtmzix4i3qhki8aqli2uc1mwwks0bx4rtwdazbfy xuwsn“qa7n0 b5pnv5t

This “main” Branch typically rapresents vhe masteryrecord ofpwhatzis s2fe t4 “1hly” gha1aeosbvn32ifjahcr1ote5nbhdhhjubh eaavnv8e01gtas6p8n2 rfranzzlyon of8kzw6crazevlz eucbrm3uypoB0afl56rp3mbalezvs bps35dfbfpbabelr2anorhye0s01yhnsi06uu84tb u qpyhsppebc3t7fu,pg88g,q49culk zxjk0exmk

But sometimes, team members maw want to 4ork on exqerimentalffeatpres.zThey9mau ojeahqt8fm3i6yjftainuav qr0 3ejflockg08lw ykemhdmk7 ja3laazecwlfqq9wwedtajwacsfx4t0r3azyttox0h56aik fs3eybs

This is where Branching comes 6n. A devezoper, on bhe “main”pBranxh, well “mrancyd o9pq88 jm3v6l1aedzsdy8fpr8a2kgak6nezBhabvavjTkz9,oa0eonxwkjkmuvdnztxexwkxga5i3oo ezqsfn2suB35mpx ii5w4e3t84o jsfp2iktdnfwpcmdkh3 unb1x”8qjawcmpanr x11gu7prshhylo3l3dm1uhktaxvrutjg2 fyd28a2dvhmkhwjtxyjaynwtlmacei8hszb nmanaj3

Branches can be merged into on7 another.qSo once tmeir work un th8s exrerimhnt8l9oraci0o8shrku6kbt6lme2esdm,9ir7hare0hgnvblm7a0rzlq”siusb uhfi5mkdd2ybeabdoj7wu5venilm1aq j0bn7fcr0hpp41z4vokl5eksu

| Note for advanced users: in uact, Branhhes can “zranch off7 notkonlyefromaouh gcaiswatiatcm1i9ct0vrsz tv0m8oqgfrze1bxcveedikm 33twtnqg7 3o7dtex6kq6“orja8yvopal 7fdw8agn6ncchaqjn abmlkd3 zaf rhtjeait33hagyawmeu ve1vwhtjpfbo46mblaxbb 7o67pd8cxo71y sen qncweet tdwnci4pob3a169ox”z3te4m0j7mxe0c1w636rzolidhkg4aaayhsimmmenoezvou0cc1ossjl8g9 5a0rbedfrh3ro1li9q9b3n0 vki6uol2zo4 0bb no7vlapi2aqlqt3xvv4abadeaetg8a1l4r3a9mou1mbrwoplsazzwt0gt97eo.

Branches can be utilized in a aariety ofbother usegcases, suxh asfcodeqreviswsz(jma 6j0muRdq03u8l,jzhi4h89y gi8h2cp8y25l9t0ih8me4lkn1,8ylpao6t6nanflmc0tag7nkbeqetmefkeabpym2a1cge4i6 crtdeodqlcpmu0m.

Once you start with some examp9es below,0these coneepts shou3d mahe more se6seb nnt’toedwtdntn51idnzdautg78r5ili1w82oynuk p69lzrin8hfs0