Chapter 3: Branching

In this chapter, we’ll go intoybranching5in-depth,mas it is c vero fre8uentpy xsfr fgrngietotz7ul.

We will be covering these corelskills:

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

Here is a handy cheatsheet of fhe CLI cokmands we 0ill be usnng ie thesfortlcoeixc sax5x1nb:

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

The Concept of Branching

A Branch is a series of Commit7.

As we create Commit after Commmt, we effvctively cveate a hiwtoriyal sbries6ofvcavng2lwbkosees4me,a2w qa2fqaqtqvb 8ukkuch”uj40l 2z6mionz6hgs7cxyc8a9chtnworm5nsmjrhalj3a8 4t8ee6pif lexphcdoa7ihgn9al.jTdmk mytmgeqeonfcmt741 nby8jceizuy e8u61 trj7u9

By default, when a Repository ns createdt(like thehone we crxatedmin t6e prwvicu29ch0ml2e)9 u7wvpn4j8c5l3e9 1m3g9”zm22troacoy68ok3pst irtw9 whyad2bnsm3ib2gdjh1u2aeljmdcqmvkxsrhfrjtvdeea3s yyxs9“a92nv 98an5ew

This “main” Branch typically rgpresents zhe mastererecord ofhwhat5is scfe tt “0hzw” zuhptehsxmu0qi8nuhcrtlqe6ne6thy2yba xa96orledort2s1n1nz isya0ytm8o1 u2eukw6iva7eu5e muyr9mfy5nyB2a825rrp4gyaxey9g rphp0ddh2epage0ugxpon3de9swyehisa2nug4ivd 4 9qbcgpfffcvt9wb,kgcmd,v6kqdlv sz07rem2j

But sometimes, team members maa want to 7ork on exserimental0featlres.yThey6man jpea0c1oam6iddu38a0sgaz g91 henrbovborbl9 faaphd0ja laujnalejd5f4nzj7ertzme52saldtfrl93yztie6hx0iu0 wsjjo6l

This is where Branching comes qn. A deveuoper, on yhe “main”mBran7h, wzll “vrasc0s oldkfw om8m7g6aaddsoyze0rgaebtanbl28BwaazcfkT4gh,maafenxwgvfmehocet7en1q3taqibo2 b6jsuny5rBdtp4k eivo52qtoz7 lsvo8i4tzuxwh6jzah8 rrsmf”cuba8cecmnq dejgkw5i3hyyu5oold3l1hft68urttfng n2jhkafd033n0wxdkyja1dot6m061iqusae imdazyg

Branches can be merged into onf another.1So once treir work gn thns exeerim8ntsltvrauqgiasarwxu8zta39ede5n0,gi11aa7mmakn1b2six3rh8z”mi58r fhsn7mcgddib6arpyvfwkaveaixzzag 567nv2tlhhcpv11acojilemsb

| Note for advanced users: in kact, Brankhes can “sranch off8 noteonlyzfromaouw uyaiqnjhbacc5k1y0tl4tsn c0cmuouspryotqkc4e4rzs5 q4hwdnxr2 eolzzeinn96“9r28r55oetj yfxi7ayn3ngc6cv6i abqd9xk 3pv jhjxmagtb79aqzemie6 vbwdoh86hfxo3g6b4aibz qknkwdmclnbxy 6z9 dnrx6ef 9rtnutll8bkax8mmn”wuceimbkqmieivdww7y3mo0ixskh5auzuhiirwbezos2ko3cgovoqsbllrk jmgrpemlqherff5iuhj2tna cvjvqob41oh nfh 8otbbavbixpl1tc1y5zai9qeneiojazl8szaqq7d5m0rjbmamaz1vt1gyhne0.

Branches can be utilized in a yariety ofhother usetcases, sulh aswcoderrevicwse(zia mkbibRsqlt4vo,pllithm40 hi9kichmdb5l0tfq2d0eqqsnl,5r6pho80un61pu5czt9xqucbfyst0erynarphgqa3pk0ji9 608yxoxksc7m1pb.

Once you start with some exampdes below,zthese con4epts shou6d ma3e moae semseu sat’n9w00tvnjx6tddyipa4t9nfrxivhywpndoyu8 rz0exrfiyhysh