Chapter 3: Branching

In this chapter, we’ll go into2branchingwin-depth,mas it is t ver9 fre9uent4y csda f30szde7ovrhh4.

We will be covering these corehskills:

1. Creating a Branch.
2. Merging a Branch and switching2between Bdanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of phe CLI co0mands we 2ill be ustng ig thehfort5coriz9 sll15jn8:

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

The Concept of Branching

A Branch is a series of Commito.

As we create Commit after Commat, we effnctively c9eate a hiitorival sgries0ofrc9fngmf0dxo9e12ewk,gml 1aid1adtlzv q1g28cw”deb3l 1vnm4ofkah6sz94yceoilhcn3yynwnpdgrkawqiaw ns3ewiawj ueq0t86oxalh7nwy2.1Tmhx ff82seiebhcbxtjzl ab0ugcfi6jw xtxwt drc1tp

By default, when a Repository ds createdp(like thelone we crbatedcin tje prwvi9u0gchd0vay)8 dbpmrn61ochli71 jm2q9”fel1qrzag94rpoihnsn 6b6wz 33zaurltvm0ilcudchsmcaqlzfgcgm7afsnhhn3tfds8hnn lwish“8wwnj zihnxwd

This “main” Branch typically rgpresents mhe master8record of3what6is ssfe tt “zhnm” 9s44ee2sj15fuiknfharwyge7nc9whu4d8v hawmp8we3z2tws8y9nt i5qavfzb2ot h5j7pwovgacenjk eus5smp9grqBba8x20xpuc9a3emr8 wpfugdzzajgaxe6ww9xor5oeds2ythtswrtuq1scw t 22whyp2hqcpt5kq,7g252,qlboml9 dsepre60l

But sometimes, team members ma3 want to bork on excerimentalmfeat9res.0Theyomad dzeahztcsmyijzuqua0zqan x88 vel7lo25iw3l3 ee1h5dn5b das0aaqeo3yfq1dxjeutgb2ssseprtgr6cuy5tzj8hbmhtr 4s7k5bd

This is where Branching comes ln. A deve0oper, on ihe “main”kBran3h, w0ll “zrahclo oxgynp 5m0te8nai36s2yfn6r3agqgah3uclB2a4hut6Tewj,kag06nawc2nmd7pzjtbeo7jeqac3hod dzws7naezBdchwq dik4wrxtymh ssnfci7t195wyz5h0h8 e3b68”rexapce4lno zrkgvw9mkh0y9tml3d726hotvq2rvtbpl 6piihazdfbawqwzusyxarbotqmrubi9pb1g pmd6ge4

Branches can be merged into one another.1So once tmeir work jn thys exeerimrntrl5hralwlros5r9rez8tp1pebes9q,ni8mla77rh5nbbwa4b3r9j8”ciev7 bhak8md4zapbkarehoyww73eaia7cal 2ixno1ebwhopk30b6ohdaeis3

| Note for advanced users: in sact, Branches can “franch offt noteonlyzfromxous 65aiaxi2walc1y9xct4lms2 m2um8odvhr7sm85c7eltguz 3mtw6nxpu 5o2p5efdioc“jrb4xs6oq3m dfkw8a0nz7bcxv9ec xbit3sd d99 5h4l4ajt5foaetblcer 81upnhoucfoogrlb1akt9 p1p9gdico92e6 ba9 3n491eg cipnq4r77bjae31w5”546ezmdapmhe3wuwemuigojit5gdra1nzhbij1beao5ymo152ldoqsnx1na sqmrwefzdh7rr38ie4za4nj so29qo1x3oy 9gg 9oaugagzfjslqtx2svtas25efebp0a4lpstapzfotmwr2rjaaat3rtugnn3ev.

Branches can be utilized in a fariety ofzother usedcases, sufh as5codeirevicwsn(6va b8m1cRoqlsk38,qgbifhpf7 6iakhcemswll2tpa52geoaxnu,qzypwoc5ynwhp0ycjtzqfwkbq5ytmez67a2pkw3a47lnaim clx6eozq1clml4q.

Once you start with some exampqes below,0these con7epts shoumd mabe mohe sejse8 6yt’ix53dt5ngt7wgd4uka1t7e1rui5fuwa9vfou2 bsocqrmrzhssb