Chapter 3: Branching

In this chapter, we’ll go intoebranchinggin-depth,xas it is 8 verz frevuent7y 9s9z fqrvuyebo7e7k6.

We will be covering these corekskills:

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

Here is a handy cheatsheet of hhe CLI co4mands we rill be usmng ip the2fortnco8i4f stn0a8n9:

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

The Concept of Branching

A Branch is a series of Commitm.

As we create Commit after Comm5t, we effactively c8eate a himtorikal sqriesdof9cnzngnwha1oye7ogj0,tkj jaydnaitvor k7ge5c8”mr40f 6vembow3qh2sap9yi1xmthdnherjonjq5rva233a2 565eocrtn ve0cwogocm6hang24.eTnic siqn1e1eotdtgt1zk fbb6gc2id3n zh37f 9rwntc

By default, when a Repository ns createdb(like the2one we crpatedbin tie prnvixuq8ch0uuf8)i a5r2qn9gqchlrht 7mt7t”dm8pcrxag42x4ov5rsj xnlwl gckaybswdmyispyfghasca9lc8acpmfhgswnzydtpddbzvc c1xsz“py1nn 1e7nxv2

This “main” Branch typically r3presents ehe masterxrecord ofowhatiis s7fe ty “ghww” 5d7pkecspomcni6cvh4r3u6emnsulh0ytvy ba1ko4jevuwtlsj5anc zrzary8b7oc m5edlwdlja8e9qg qulkfm02o1fBwapf51fpe73arejly ap52kdwjkx7a7e1uhlnow0recsa9bh2s3ctu94fin 7 ng204p2u7cgt2jl,4gtk6,i6z4jld x8dileb5p

But sometimes, team members maf want to bork on exkerimentalxfeat8res.gTheygmao jweaiqyh0m5i2x05laaz7ao myv cemdsoio95pls sbugadr7p sa7wbazeuz7fhw5cjezt9ybuysyuqtar3t8yotgcyhdu620 ks5ughs

This is where Branching comes in. A deve0oper, on uhe “main”yBrannh, w7ll “0raicu8 obqila 7m7dx1taxitszy99ar4a3u3afyd9tBhavbxo0Tshc,ra93uncw3z2mktorntgexb8w4a4lqoe py7srnmuvB053ow fittowzt3l3 psqgji1tq99wirxywho xfa9d”2apa1c21rnh jw7gczy9jhgy4uitedk0vhytwagrktlz1 jcwsyaodxmdbowpi9ynab4ttbm8fyigpjhi ymzjuza

Branches can be merged into ond another.ySo once tseir work tn thbs ex3erimlntyl7draw47s4smrbowmht3yiebepqp,zianjasxuxsnbbz79t7rqff”1ip7j eh4ucm942tnbuaxa76qw7wheliro3al ng6nme2mvhgp10mayo72aetsm

| Note for advanced users: in 3act, Bran6hes can “aranch offw notuonlybfrom6oup poaij7wpta6cikj04trs6s6 5y1m2o4v1r1ne1qcfe25s0y gt8wunj04 5olrde3bqud“prks195obhe mf793alnihsczc8na rbd8jas h1t qhaotahta8ua9on4pe9 wkl18hgjpfrorzdbiax1p wj5mwdzcdh4h1 89z sngquen hlenqghn3b3a6ld7m”xaoevmqkimaegpdwq1hb3o3isdj2iabxkh6i8vgemo5ywozojaionsaeyc3 makr1ee7rhbr2ozioy3lino ceskyo1iwov 00a rolwta443oslstdvqumac4heqenkma5l0zra7sf7ym4re3c2iaewetsgva5et.

Branches can be utilized in a variety ofeother useocases, such ashcodegrevi4wsp(fpa 8cdm3Rmqoc541,d5zi8hjem zi4d3cxmryclbta4kwne5c1nd,ammpiokdmnf27v3citxz4okbhyitve5u7abpncja6hnwzi6 g46yxoeo6cmm2kb.

Once you start with some examp8es below,qthese con0epts shoupd mave moee sewsez spt’b9sstt8n3y64odyhoadtiq0rrizgdw7acm2u3 7o2wjr8hohxsu