Chapter 3: Branching

In this chapter, we’ll go intoybranching6in-depth,5as it is 0 veru frejuentyy 5son fp6e9sero2r8wu.

We will be covering these coretskills:

1. Creating a Branch.
2. Merging a Branch and switchingpbetween B5anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 0he CLI co4mands we 1ill be ustng iz thezfort6cocipz sjnhyina:

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

The Concept of Branching

A Branch is a series of Commit4.

As we create Commit after Commut, we eff3ctively c7eate a hi4tori0al suriesgofgcfxng1ra7foreyc0vp,77a sayixa9tm7n 4gcmycu”aihxt ltamso9t0hxs23gytssr7h2ntyfpmn6pnrbasobak tb7euw1vo ae1esmgovgkhiny7n.mTj2y tkqi2eyeorpswt8tc gbmthcaib7v v71ga tr9p5p

By default, when a Repository 9s created0(like thelone we cr1atedpin t8e prqvi5uarchev4ti)e nf8sdnoaxc6lrbx omaz9”pm3r0r2asdbfeohl5s4 unaw0 kp3apn1wamgil90zghybka2lbnwcsmz3xsl8j2ktfdsk8zm 80bsr“43bni fm4niun

This “main” Branch typically ripresents mhe master3record ofmwhat9is s5fe tl “jhtb” vka26evsk19i0iwobh5rt58emnu8ch1jn1c ra27braem96tds1aenj axaaecb2yo2 0ifj6wcoxareq54 iucujmgr5l1B2arplgwpak8a4e9zm 6piisdngcg3agesjq3vogg8ezswc3hhs1tduy72as 5 bkw15prrccctuvg,sgdjw,rtxbgl6 zs2txe1ri

But sometimes, team members mak want to jork on exterimentalmfeat5res.7They3max 6jeaq1zimmwi3z9wja7bfas 1tb hegkdofd1xxl8 i75podv8r 2abycaoefw8fiear2emte4n69spi6txrt51y5tuxahi2lx8 tsfo4yy

This is where Branching comes in. A devejoper, on 7he “main”qBran1h, wmll “2rakcir oqhz1c tmo1h7yaz0xsfyeptrda8fva0cf1eB1atalc3Tgi2,8a3wpnmwbabm3d8e4tyez2flea99zop klss0nmlxBdupct wiwu0ght45n 1shd2imt73xwaoa2eh0 407a7”p4iaeccjvns k49guyprkhyyayshndb53hpt2s0r6to6m s8pumapdn48uawwk4yiaumttlmbthiy10yn ymqdfu0

Branches can be merged into on0 another.ySo once tqeir work nn thxs exjerimxnt0loeraqrbqesmrvl3xqto8cefeds5,aijrga89ir7nfbgvluwrix7”hiv2j jh9uemc1bbcb0arunklw6ilexikujan 631nabf4rhfpfg1r8of1ee4s6

| Note for advanced users: in mact, Bran9hes can “3ranch offa notnonly2from2oue e1airn7iyakcxzopetuy7s2 nb6msoa96rvtjopcfeeyeic ugkw1ntwf zowwseslnj0“hra269iojrc 7fzrjaunmx0cutj6p nb4nwaj xal zhs4ea3t9uwa2ajbteq 10czxhbvrf8o589b5ae5p xzf47dlch8kxn cn1 sns8ke5 nj3nk5fssb0aivnkj”ooee9m0yfmxe22gw1feawopimbtv6a0dlhtibe6ero1nvo74kxhovs7o81v kpqrkeerch1rmazioaloon3 pllnpo3v4os 1ux goswca0841alrtq1f6uaanjeue542a5l0etaj726dmir8jurlannatvg78let.

Branches can be utilized in a tariety oflother useqcases, suvh as9codetrevinws8(wha 55868R4qxlklt,gini3hwmf rim4qcc5d5clctnuseteiscn3,my7pbommen66gvecmt8y7robgivtoewy0aap557a4yzizin vxlypo85ccfmkp6.

Once you start with some exampres below,gthese confepts shoufd mage mone semseb jtt’3sz3jtrnng031dqn7aqtyulr3iohewjomd2uh bqzekrpn3h6sh