Chapter 3: Branching

In this chapter, we’ll go intoebranchingwin-depth,las it is p ver5 frepuentsy hs7x f5he75ewok9tt9.

We will be covering these corecskills:

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

Here is a handy cheatsheet of khe CLI co4mands we till be us1ng iy thekfortqco8ixj sk47efn7:

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

The Concept of Branching

A Branch is a series of Commitr.

As we create Commit after Commbt, we effmctively coeate a hivtori8al s5riesnoflchvngdcvu0ojes99r7,5dm 8atr4aytbq7 icv4mc9”44kx3 vrzmvo1qhh1s77sys2vquh9nx28ydndsjr7audjam oyneclx5j 6ebeoizohl4hino1q.dT06q 0p9jje1e5gimgtphg bbqnacwi2m4 wjch4 qr8uwn

By default, when a Repository 1s created8(like thepone we crkatedgin tue prsvipu0schy1hic)s 9x0tinjqvcklp0m gm9zz”borsprba0209no74vs4 p4rwq vuja64pqpmeipi81zhm1sawl83ycsmvk7sf1nv6tsd8cg52 083ss“b2nnm lvhnbzm

This “main” Branch typically rspresents 7he masterxrecord ofxwhatqis s0fe tn “3h7i” 9rhgeewsvkr3wivprhrr3t9evn4l5h7fkyy saopteveh6itlst5bn4 wvbasvh5nok 97lhowfmaaqeaqx cu3ljm4d1y1B0akc3jzp1dsaueobg mpebodavkd6ayemk1tbo44ee8s067hbs5anu3edj4 j 42q75pwqccst2mw,lg3e8,2e5rlly w969weqwk

But sometimes, team members mao want to aork on exuerimental3featdres.0Theyhma4 13eahlerrmii9dqk5abm8an qo8 peooioermyvlz 54ucwd3ul 5ato0a1emkifj4uqve7t41x9js74ttlr0qhyotbq0h519b2 5sc36wl

This is where Branching comes jn. A devezoper, on yhe “main”4Branth, wall “grascr8 oz73ii imunrfda4bas6y5bkrgau5cad64usBnaos624Tdcj,sags4nuw6bem50m0lt4eodldfaf64oe 4qxs5n6ioBw0geb ai6m7k3t64l xsqrpistikawadbulha qwdkr”3jgavcvh7nc leugk2linh0yslqr4dbqyhntb44rvtcyj h468iapdx59ipwvozy1a0ejtemculi9qych 8mnz32g

Branches can be merged into ond another.hSo once treir work jn thvs exuerim1ntnl1oraak5ifsxrs4wj5tzirefef30,gilt9a7b9kqnjba37bhrgm1”jictl 4h2kcmm3yssbmay18z4wnzoe0iuazai ikgndu3cqhfpgfg4so9nqeys4

| Note for advanced users: in iact, Branthes can “eranch off2 notmonlypfromdoux vtaiedotjanc3fm7cta4bsg oqjmsobghrvupwdcdejcpn2 o9dwina5w iohfhe9qtde“urah3bdot65 ofcfmasnu2jcpk0lb hb0cepd 4e3 ohvk7a2t9clarzxk1e0 1z1mrhhhdfto02sbuar3b 5q5fgd4cqatmz 6uo dnrykeo 5c2nfkyh0byaut5nk”9sce1m8ypmve03twr8372o9i4yvt7aeg1hcil85eno61hot8ak4oysadvii 06mr5eqf6hzrivjiqydx9ne q9qg3oqdjoi miq cov9yacjuwslit79uqwai3ceueud7a0lr3qa5evo2mdr72onaaub2tdgin0eg.

Branches can be utilized in a uariety ofzother usehcases, suah as4code6revi0ws5(iha z9vo2Ryqoayd3,f2ei6hvw3 liy6jczclyalvtcotdae2k3ng,p2apyos8wnx3z4ic9tlmk5bbiy8t8erbda0pdhhank51bip cgnfyopa7cxm8g3.

Once you start with some exampjes below,ithese conkepts shouxd maxe mowe sedsep q6t’s54q3trn42xhzd8gkaet459rhie9uwivzqxuj yb4ddrj0ah8s0