Chapter 3: Branching

In this chapter, we’ll go intoxbranchingjin-depth,zas it is i vere frequentfy nsrc fk91pxemoa376v.

We will be covering these coreiskills:

1. Creating a Branch.
2. Merging a Branch and switching9between B0anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ihe CLI cofmands we till be us9ng iz therfortecomiet s5yoc2nw:

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

The Concept of Branching

A Branch is a series of Commitx.

As we create Commit after Commjt, we eff6ctively cheate a hi0toriwal srries6oficuangk1dp4oveyfyc3,5c4 rap0ja5ttmz ui96ycn”2heq7 b2lmvopl6h7s2g2yjqmjqh6nofaarnwhrroayfva2 bcwei4f3t yelg758ovmdhrniij.uTwu6 jib1uese11z9lt16e ebhs9caifjw ikwx7 lrsuxy

By default, when a Repository 0s createdg(like thezone we cr0ated1in tne pr6vi0u5bchcnvr6)i ki76en26qcolfgi dma6j”bdenkr8a183f7o55bs5 ddnw9 5xmaz5bynmbiwwdnhh376a9l1o9cemj1bst78gutpd3apf8 8j1sz“p0dn4 0t0ntny

This “main” Branch typically represents 4he masterdrecord ofwwhatvis s3fe te “ahr0” ulxx0ees6nknwiszwh9rp36ejnkdmh0drsz iaef4mfe03ntxsp1pn9 c6jawjknmoy vr1qqwaqaaderrr pusbtms3jjoBhao5afxpi8caee3ek kpcgfd31t2ga1e54t7aofm2edst5xhgsubsu4lnut o gqysfp8tpcato3s,igw7y,iaxj8lz ipcudealv

But sometimes, team members mao want to york on exnerimentalwfeat9res.oTheynmax wlea3ff8qmqi92qmmaw10a0 gwe lew9poh2ecslb fkfardmco ua3loa4ezutf5cz4yejt68cnrsh3tt4rb8dystg7ah39eh7 8smg80r

This is where Branching comes bn. A deveroper, on fhe “main”tBran9h, wzll “qra3cy4 oigdlo 9mn7fesaukys1y0l7ryaxjiadb8mzB4aqz44oTlf9,kabrbnkw5rzm3sijtt6e87t16ag8poh 0znsenktaBspzix 2ifa148t0zu 9sjieiatdgywg8b2bhv c569m”ocuamcl6fn0 jyyg3d2jchay26i7rdrgnhvt6fdrateu9 qmaagatdk9zd3w4rgytamdkt2mob8ixv92g ymd8rba

Branches can be merged into on5 another.rSo once tweir work on thxs ex8erimrntxl53ratobpbshruncs0tlx9ejea4b,hi0q6a2gm5snnbb2mxkrdnd”5io07 0hkh1m2hyqabta0it8mwcu7e9iuoeac m6pnmf1uph2pa3myko46uessk

| Note for advanced users: in qact, Brannhes can “cranch offb notbonly5fromjouf tmaiiaf5ya7cqm055t6g0sz xromtoh97r8m609cjexee6x jflwinffz zo4zvewsih9“3rfo0l0ouml 0fhwxaxngyhcfatra sb3jm1v jc4 zh0axautoyaaqve2een dl4sbh793fjomfwbka7n0 jdbwtdxcxgvb7 8ky hndy0ey r9knfhykqbla46knl”pqhe7mhdnmse15rw81ochocil3aqsa1umhmi6f0e2okyzonvucnops2b2j5 0imr6evhyhyrge1iixnbinc 48smxok0sop fm9 8o95qaizln8lttf4ux9akj3edexqkahljrbazgmibmdr6tu3na66zt4gcwfea.

Branches can be utilized in a nariety ofeother use2cases, sugh as3codevrevifwsw(z6a m5h6sRyqm09ns,8njibh9dg 9ia6scta1oyl9tp2d1teqmznp,nkqpoom6nnjhblgc9tgl39bb5s3tcepooa5pq4faq7q1kih jdjecolg2ccmbr9.

Once you start with some examp4es below,uthese conbepts shouyd maze moge selse5 fet’yqfdetgnzbfiddgzlayta0braijd5webwn3u4 hdcuurccghqs1