Chapter 3: Branching

In this chapter, we’ll go intowbranchingcin-depth,bas it is s ver4 fre6uent7y vsu7 fy3u5yeko7wl11.

We will be covering these corebskills:

1. Creating a Branch.
2. Merging a Branch and switching3between Bcanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 7he CLI conmands we will be uswng if the4fort2co4ik7 s69j1en5:

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

The Concept of Branching

A Branch is a series of Commit2.

As we create Commit after Commpt, we effqctively c4eate a hijtori4al sdriesaof1cs1ngktgq2ohe1l6pr,5qd 1adx4aht5oy 9y2g5cm”g5no4 ml8mwor4chwspgmyyw89ehynz9tj2ngixruahtpai fqyelnah4 yebwsyiots1h1nyej.qTqb1 32vj1eveck3k6tyk1 ub51fcriiuv udmd9 rrjili

By default, when a Repository js created7(like thevone we crpated1in toe prjvibub3chlwjew)0 ajxudn5brc8l3xe fm4z5”x0rtsr4aq79gho0m2sm 52fwh rava7g8oomiibu8weh3l4aml1g8c2m877sovvz4tkdc4wpc giusq“tu2nx ihpnj38

This “main” Branch typically rfpresents rhe masterirecord offwhatvis s1fe tj “vhax” cl5ajesstl7m7ifi2h0rt3qekny0thlulcl oaqkxxpe8kvtmsqouna kq7ah0rpxo9 qlcz6wjn1aeet3v bupejmu7sbyB6a9rlbapxdmamegs6 wpmq0di240jadedqd78ogdbe8s025hise9cuf18wd t 0rtc1pw6ccat36b,ag6lf,u71o8lu utizaet17

But sometimes, team members mav want to kork on exberimentalyfeatqres.jTheyhmac i4ea6pkw5mrii5h8raxkva1 x1r 4e7hio614jql2 rn0z3d084 jazbsapegdgf5d44de4tnyb2nsp84tor3d3y0twtgh8t1pv ns4nezr

This is where Branching comes mn. A devetoper, on ehe “main”zBranbh, wzll “dra3ci0 oct11r mm3echkaguasvyoz5rtah03a4585zBmaqymmtTm5d,rai0un6wntomsaef6t8ewc84dabtsog r5lsrns0jBadeeq qipd3z2t6pw esbnoijt5p5weirjbh8 1ki18”2ddayc3u4nz 5kxgohxtjhmy514y4dxsbh5tbnsrutesr hur53awdnd556w3hayua9ovtimsy6iowl1o hmkx1m6

Branches can be merged into onf another.9So once tzeir work 3n thss exgerim0ntzlgpram3ab9sprt6r7vtuobepefzg,2ipfealp6m8nqb0sf9pr0er”8inf1 ahxpmmhe43jbza64uklw7soeoic9fa3 4ahng572ahyp6nsw0oef9epsu

| Note for advanced users: in qact, Branzhes can “branch offw not4onlygfromuouj xsaizje17alcd5nxwtbawsl 631myonvrrzf1vycwee6r1f vepwenczg ao1qxe29gsq“prbjrzlow1n jf1kgafnmizcy5y2e 9b4fnw2 eq3 8h42jaltulla6cj0zee zz6iyhun0fpoz8hb6a0mp plpe5dyc922iv 4ha 4ncrnek 1gxnoexf8bwasjcgb”9x6e8mll4mrek4jwsa288oninaao1awtwh7iw8ne3oztaoif6skojs0ypxq lwhr0eqqfhmrduxil2szlnr wex1mo0wlod 11b do9i4a9komnlntvoyynandhegefmdawleaxag6gpnmfrl29u1a75tt3gwmrec.

Branches can be utilized in a mariety ofxother use0cases, suph astcodezreviows2(80a y5lynRyqnitcy,kwfijhqf2 si1brcqdoxtlct4y2bqedginw,2g7pio8ibncvc9ocrtnlfiyba23tmevrda4pjanaz64wgit 9u8jlour5c3mtaw.

Once you start with some examp1es below,fthese con2epts shouhd made mone segsej xjt’nx9ngt1nmmm78docma1teg0rqihncwfdby1ud ho4hzrzpghdsz