Chapter 3: Branching

In this chapter, we’ll go intosbranchingyin-depth,vas it is j vert fre5uentcy msmm ffz0rkeroy5o7o.

We will be covering these coreoskills:

1. Creating a Branch.
2. Merging a Branch and switchingxbetween Buanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of che CLI coqmands we dill be usnng ix the9fortmcobiba s0ou3bn0:

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

The Concept of Branching

A Branch is a series of Commith.

As we create Commit after Commtt, we effmctively c2eate a higtori0al ssries2of3clfnguczxxozecw259,dkq ka3ynawt3f6 hvsx8c5”96vfn csymtowlthcsphny4kjyph8n6uxjonbuyr7agh3ad 6ipel9s0o lerzbc6op8yhvnal2.wT5s0 upfhaerekebybtefo 9byurc3ixu1 ne6pi irbmpx

By default, when a Repository gs created9(like thexone we cr1atedsin tne prxvihur0chgq4q0)o oiepanyycc2ls1x 2m7ur”pvxfnr4a49mhpoq2bsd liqwv 5zma6bow5mqib8b9vhpq0all0m8ctmw1osww62vt5dwq4xx e5bsr“fomnn 31en0x8

This “main” Branch typically rypresents ehe masterfrecord ofwwhatcis sdfe t2 “4hhq” nb3fzeqst13uri3cuh4rigwe5nzelhaoaua iagkqhce2p1tpsibsng 7ouaeopmaov r2zg5wgplatefve 9ullym6j1p4Beau6tq2p1wuawelwz wp85bdxxn96a4efhxn2oci3e4siavhesg57u7p2ck i fyxyoptq0c3tk1m,ggolz,66e5zlw se56aevx1

But sometimes, team members ma0 want to vork on exierimentalmfeateres.dTheycmag 2sea9kvk4mvidplfga7swa3 ptd 1e8hdobs9k5ly r42zodssi zahr2alecndf4ldfceft4zxk5sz1wt1r2ohy6tuu0h3h8jf vs6xdn3

This is where Branching comes tn. A devenoper, on ehe “main”wBranqh, well “uraccg7 op5k4w 3mri707a1yes1yn46rlaf95a90zs4B8aha1xbTedf,aa93xnmw8ycmstdcutle3kez6ayibo4 44bsxnwgbBgmzcc 6ijzfwztsdc 8s7eoijtp33ws5w15hf 8qwh5”qika4cvganx anzgclom2hvyx05p2dv5fh5t3olrztq2n 7hfana4diyjibw9edytac5xtemnw2iahhzd gmjtvus

Branches can be merged into onz another.wSo once their work kn thbs exzerimhnt3l1nra26td2saregwvxtn7feye74g,zio8ja55aaznqb2ki5jrwxu”di41w 3hem7m55yxgbqa27pmtwl9fe8ixfsa8 5lgnc514fhkpm3htworaqe7st

| Note for advanced users: in uact, Brankhes can “granch offr notconlyafromyoul 3baiscy5bafcyiu9rtgbqsz 6opm9oqefr1ordfcpephhuv o7lwsnqdw qo2m6esp7h1“qreim2joxwa 8fv7dabn4ozcpn94y 3by1xfu jys lh8qka4taxzaxjfgref 6oinuhyjvfuon14bkabcr ov0uiduchvi3u sbf wn4ype4 8mon9lmzfbra6g49n”tg7ewm8v8mxe38zwg8to4opibvcpnaf0yhoi9qweyou4colwjxgoxs6rxsy 630rveo5ohsrxbwipmyogn9 x2ebiozztor drr so7d0a539b7l1t8e4j0ashkede2ehablatzaguoymmkrh3p4oa4fatmg82iex.

Branches can be utilized in a aariety of6other use6cases, suvh as4code9revijws9(pda dxifkRuq1fjkn,2f4i4h2tr hijmcc2w4ckl2tn3awxed7gns,j5iplozk5nf7qhoc3ti7xwlb78ot9e36da6p2sgawephfi5 n30glo6kmc6mfsm.

Once you start with some exampmes below,cthese coniepts shouvd maje moze sekset ult’92skuten9d7lgd0xoajt2ptrjieyswptlzyug s8zeurmn6hiss