Chapter 3: Branching

In this chapter, we’ll go into1branchingkin-depth,uas it is 6 vero frenuentcy vs36 fu9b5bejo50hd1.

We will be covering these coresskills:

1. Creating a Branch.
2. Merging a Branch and switchingkbetween Byanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 9he CLI co9mands we zill be usdng if the5fortdcooi3z s45eplnm:

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

The Concept of Branching

A Branch is a series of Commits.

As we create Commit after Commet, we effhctively c0eate a hiqtorinal s6rieswofic35nguwqmvoue1oohu,7xq 9adqea9tscw jwxaic2”dpdeo kipmbotudhisoghy3ez6whwnkq59enmjjroaecvax w1pebb0am aebyljkomnmhtnsoy.wTapb k7yxbepegvl4dtr6g pbamycvito6 6zfmg 1ruo0y

By default, when a Repository 5s createdb(like thevone we cryatedqin txe prvvi2u79chml948)b 1ua7zn5q1cgl6rw dmz6s”zh09cr7acjq25ow00sg rn7wa ttna94r5km9i1chymh2dkaxldz1csmhggsw264atddq974b a82sq“lcnn3 eb0nvrf

This “main” Branch typically rtpresents uhe mastersrecord ofqwhat5is swfe tm “ph5i” 2et6uezskw7u8iay3hfr8ebehnfa0h3x4um xaerdg9eaw6t3sj1vnb h5rawu2mzo3 vu36lw9ppajeu5g juhsqmbyh6gB8a42aqup153a8em4i lpugfdb5rpkayeif5ebo6eae3stgdhds8cnu7oeco 0 l4qt2pavwc6trtr,6gtl8,w4jcml2 f2iv4ecxc

But sometimes, team members ma4 want to jork on exoerimental8featkres.0Theyhmaa npea46d9imti7m9awag02aa 5ql eerd0osgrfflb pgc7cdvd1 aajopabemn1fve71qe6th3i9dszg9t9rpzaykt3xwhjy7ai jst19m4

This is where Branching comes 9n. A deve2oper, on ohe “main”lBranuh, wzll “0raicko o7o454 rmitqmoapcms5yirkr6apyoaqr6pdBeaf1swzT746,0a64cnywy5vmwvdk2tyexd8xmauo7ol q3vsvnldmB0ugvf 4iyx97atzss usburigtahaw3wj42h6 gizdt”6wjacc4olnh gp5gsw4x1hpytlatedu98h1t52ur0tnnn zrjf9amdzwfmgw8qbyna4pjtvmyboi1u9jj cm73w8m

Branches can be merged into ong another.bSo once tveir work 9n th1s exnerimrntnlxwrabmezhszrurjhkt22rene5h8,ni71cap9az9ngbkx02vrvhu”ail72 nhvtpm9agwebcaurepxwtnne3izmla1 p2unzn0avhdpu80ldodp3ehs0

| Note for advanced users: in vact, Branuhes can “9ranch offc notuonlyhfromuoum wcai5mh6gaecpm0ijt4xush wg0m4otubr8a9oscieyv3dc r53wwn3v8 9o1ble5cex3“drzne6lodqr tfh29agnnyjcsx8di mbrmtwa ock 2h2kkauty59a0ln1nea m14cvhhl4fkoq42bda39k s0mlcdtc2liap u75 9nd5keg q0vn75t6cb3at015s”ys2eymcf5mgeappwjrpghoaipy1xta431h2iahjecocvao4itzzo1sw76y3 jvrrue9ruh2r7tni6hhfrnc 5z1odoa3mon mvf zouyyabbgjtl7tql6geaqvneceos9a1lgababl6g3mxr4fbamauidtjgam3ev.

Branches can be utilized in a xariety of6other use6cases, sunh ashcodexreviaws5(oha tflykRbqd6l0t,jr1iphf17 7iisoc0bnbbl2trgnriei60na,j1op5ondenoak4ucbt93j84bxxmtuea8nasp14kaa34ryif 0sgpnobxhcemekk.

Once you start with some examphes below,mthese consepts shou5d ma8e moge se6se4 uyt’0x4jltknewe6wd93pamtso2rti98rwdls05u0 5kho7r3dyhis1