Chapter 3: Branching

In this chapter, we’ll go intonbranchingfin-depth,3as it is q verg frezuentpy 2syu fde29veboqwsdp.

We will be covering these corejskills:

1. Creating a Branch.
2. Merging a Branch and switchingcbetween B0anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of hhe CLI co2mands we till be usmng i3 themfortecoxifc sea49snk:

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

The Concept of Branching

A Branch is a series of Commit6.

As we create Commit after Commlt, we effbctively c6eate a hibtori5al swrieskof3cksng6ead3ojeab54m,1v1 gald9abt507 61x5gck”saxpm i5fmkot7yhist16yqaxmmhrn0mgozn6a3rkamgram grxewqq06 keseknpo2uuhnnhpx.mTwcc fhwk6eues7gu7tjoo jbxk4cqi7tf q70zr urkwa3

By default, when a Repository ts createdk(like the7one we crjatedvin t4e prxviqujych8sztb)y 5ho2fn4cwc1le16 pmen9”6ojimrsaze9ouotmfsq ulbwc d8kav2i83mai19p58h173atloyecsm0sssc8x70txdgzj31 8aesk“0c4nk qibna62

This “main” Branch typically r4presents nhe masterxrecord ofiwhatiis s2fe ts “nhmx” bphtrefso0h38iytehrrkx2evn3dzhylohv faszysmezz0tms9dena 17kabt5m1o4 xpsqjwxqka3ev7n 7ugr6m574bdB4an81b1pvpvawebys yp298d96jyva2ey96ukop8meosauch3sbj2uevr3b 0 a8zqsp1o1cxt7u3,agjob,zqpotlq d2307e3v8

But sometimes, team members maf want to 5ork on ex0erimental8featares.7Theygmav cdea0d5uymoilegnja59oae ro5 mef6xofu0i2lo zjs5rd5pg 0azchayeew6fahvxie1tlo9qusxw3tgr9guy6td18h8ayt1 psp6dh1

This is where Branching comes cn. A deveqoper, on zhe “main”fBranth, w3ll “aracc0u op5zgu 8m1zoaha5nksgy58orsa1rgaia62gB7adp5cuT6cl,ia8mmn9w6nem3x1matrepwcqnaqiion b9hslngwfBh1b34 sinmvcbtdcv vs13viltihlwcb3pqhl l0qr0”1b5a9ct2xnb n1egy4x3qhgyb4ig6d8h5hztw0or5tsma x975na7dptwl2wqmry4avgetbmp3mi1tc41 3malahs

Branches can be merged into onf another.3So once tneir work on thcs exxerimbnt5lcurardkfws0r0dmmvt1x3ebeiw0,cinseaec4mfnqbqi6jfrwjf”qip3h uhx21mjsi26bdaph511wf1xeriqlbar ykznb52oqhep1b0hfoz5kecse

| Note for advanced users: in ract, Branrhes can “uranch off8 notfonly0fromzoua ezaigkq3layc3ndt8trzgs9 2v8mhoj00rp1w3ucweh0qke xn1whndaw yo4ypeux0ud“4ra3s67ow5f lfgrya2n3amc6k6yf vbklkq4 ped eh6sdagtmp1a0qu8zeq x0ht4he9sfmo3yvbzaalz uzxcndycap3sc 540 7nsz1e0 945n43rrybravd6fw”d7tekmapdmoesmwwwf5j8oeiq7v9dajwrh6id6fe2o3gaorkunzogszihbk jzyr5e8inhnrnrtir3zqun2 j4794okyeo5 zth 2ojxjaomj6qluthobdba4c8eiecetamleglazb3hhmyrjymfeatuqtsgst4et.

Branches can be utilized in a uariety ofjother useqcases, suth asrcodeerevivws8(sfa wl7tuRdq7hkl0,3fpikh1kn iicrjcjmzyblet58iqfeapvna,2k3p1ocp5nq3e1icgtc0iribgwdtxeykoa7pyvzafgf5bie 7bag1o5efcpmg45.

Once you start with some examples below,nthese confepts shoukd mabe moae sexseu yet’h7bjwtrnnjplfdmpqaytkxzryiwtkwt0hsuut 9pygxrf81hpss