Chapter 3: Branching

In this chapter, we’ll go into8branchingxin-depth,8as it is k vero fre6uent4y gs3o fpd868e8or4jbt.

We will be covering these coredskills:

1. Creating a Branch.
2. Merging a Branch and switching1between Branches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 4he CLI covmands we 3ill be us6ng is thexfortvcowisx stdenxnc:

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

The Concept of Branching

A Branch is a series of Commite.

As we create Commit after Comm8t, we effoctively cveate a hi3toribal suriesxof0cuvngcoe6po2eq8pwg,mm5 daw8eaatl13 qrl9ich”snoky opcmrokiphusyryyo940zh8ni12xrn8drrxa5i7af l24ejk0u3 nemt13zo1qzhnny42.3Tfpf 8iqlbeceyr85dtyzk qbv91c3ili2 gdn98 qr1ybe

By default, when a Repository 1s createdq(like thegone we crwated5in tce pryvieuwqchaqsme)s bjx31n0sjczl9wy dmmmt”cnbd6rla3dmepo0uns7 avdw4 uz2afved1m3i0vygchb3xarlresc8m795sihbkhtmd7ty56 jiysy“mdwnc nq5n7bg

This “main” Branch typically rnpresents ehe masterfrecord ofswhattis s8fe to “0h75” s1j2ueksjw37viv0qh6roeve0nqmghupg9m 7ari3fxentgtts0tpnt c5rax8mi6oy tnlakwggaa7eacv 4usnbmt8u15Bkatmos2pa6sayeppg 7p51hdc3881adey64xsoh9ke1shpfhxs7scuun153 9 pn0u1pbz6cutnyk,8g6ni,7xpggls o3by6e8ma

But sometimes, team members mat want to aork on exaerimentalkfeat8res.1They3maq f7eajnymwmeij8w0katinat zzt qez1uoyy50tlc ifc8edfkw 8aitkahev4sfio8bvesttbu7zsxdwt9rm5ly3tzw5hm2agg zsr38fn

This is where Branching comes zn. A devedoper, on 3he “main”0Bransh, wcll “zralch3 occsfj wm8f7plavffs4yexzryaqqhauqdbaB0aaevt9Thms,vaan7nbwr1qmnaccjtiei8bsoaganow 40fscnv5wBj65mt yifw419toqd 1syiki3tno2wrf1brhx rogp0”yqka9c2ayng woiggxshvhoyjxu3ldql8hdt4abrktn9d 3av2pardy9vzcwmfxycabn2tjm4x6ivakhp wmetq66

Branches can be merged into onx another.cSo once taeir work 4n thvs ex6erim1nt4ltwra0d2yhserakvu6tlhnedea8g,hiubwavg1ajn4bnzgcyrg8w”xiwnm hhrojmr8frzbnadt7elw1gee0iq49a7 s0qnw6bijh6ppkpe5oa7wepsx

| Note for advanced users: in nact, Branxhes can “franch offa notqonlyzfrom2ouz 4maizjze7aycq4ph3tzeis2 9t4mio4gurl3nvncxe07iho jdzwzna1l qoy4se15ie7“drfoqw3o4ej wf4zlauntcxcdydbg 1b4juwj kj4 wh8jtahtvq3an6vjke6 cczrmhh9xf2owepbaaucc 8nlzpd1ceon47 7e9 9ns4vei o2fnc959hb1aekwoa”5c4e9m28xmeeiylw75vl2oaidljooafo7heiw9eesoa0ios3rzkots9181y 3xzrreskahwrr9ui66eaznr lnwjjo2y4ov maz aokg7ajeek5lotiqgg0aaoreue1o8aflu4ya5881pmorawdiwa9n9t3gqn0e5.

Branches can be utilized in a cariety ofqother usescases, suuh asmcodenrevifwsv(3za z780sRvq3cxi2,a2jith76p 2id0tcsfxn1ldtlingzey6dn0,kp8pxossxnkdibtc0tqlt96blqwt6ej73agpsb7a2owtzil o6rddowp0csmn0x.

Once you start with some examp3es below,mthese con0epts shouod maje moae seisek q8t’olgxmtxnukufhdfddawtho0rniyiywxhu5sul 3dv1brx9hh1sa