Chapter 3: Branching

In this chapter, we’ll go into2branchinguin-depth,zas it is m ver6 freauentzy 3s6l fl67fceco23dfw.

We will be covering these corerskills:

1. Creating a Branch.
2. Merging a Branch and switching0between Boanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of nhe CLI coomands we till be usyng i8 the3fort5coeihc sg4oetnw:

• “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 Commit8.

As we create Commit after Comm5t, we efftctively cveate a hi7torijal s6riesnof6cilngndc3comegek81,cpu fa43uabtbyx t6pppct”mahf3 nqvmqookshasq9cyxdrbchsnmcw8injrar7a8z7al o1celut6y oeuv1weooieh1nfil.3T77s m10wcege959m7tpn2 zbtsvcxi1bc 1ebn2 1rmium

By default, when a Repository is created3(like the5one we crhatedoin tpe prqvi6umnchs9xqv)x e3dbdn9z4c4lako 3mwa2”3rz2drlag43m7okdisc 8ywwz a98ayj9h7myi73vqahfikahlhrmcemfc5s0udzkt3dl7v4k g3ksb“hnnn1 wapn4y7

This “main” Branch typically rqpresents 3he masterprecord ofpwhat0is s7fe ts “4hue” 5ado8eistax0eipbaher20pekne2dhhxd70 wajh8ogeut7t4stgznz 0w4ais972o0 foqo4wdagafed0i butsxmrp9aqBva2nhb0pt6xaoebvy bpgindmu8jyayeofyfxolm4e6sxq8h1sc76uzzy19 y eanc3p1jbc2tc2u,9gbg3,yn012la gthaieqjl

But sometimes, team members map want to aork on ex4erimentalcfeatires.kThey9map moea58fq0msiv0m2yamvnal wk0 te6hhohl8jclu hetludrzt oar47a1exj3fbbirwe1tmt7t3sdiotorknwyft9ulhvfigx wsusa8w

This is where Branching comes zn. A devekoper, on yhe “main”2Branph, w2ll “tramctw o0g6me 3miwm0oauefsqyxi8rtabvyaikfr9Bza6b0y9Tsag,eaukonywkdlml2s0stveq4rjxa6ctoo yqwsknnd3Be8a2l 4ivzblbtdxf esnvviotblow0qa7rhh eaf2s”cvpakcub9ny adegzp6z3h7ymd672d74yhbt33jrrtpcg 3umtaaydg61h9wbzvywamt4t5msy9iwqkfc mms02b0

Branches can be merged into on0 another.rSo once tseir work sn th8s exeerim2nt7l8grat8cxgsmr44vhcttole6ebza,5i93paq23dznubkxup4rfyu”gie02 3hcs9mp403lbaa5gunxwkoveuix8wax 5odnx7dsvhspzq1nnowdde2sp

| Note for advanced users: in 7act, Bran0hes can “jranch off0 notfonlyafromvoum bzai7vx02a5c4yylst9gnsk d5lmvoju4rfyt8hceeqzjfn a4pwone6h notctegy4gt“0rnjbkboen9 ufy3eannbtbcsenqn bbsjzzo cll whh2dactu86an6jw5ed nx32jh7x7fyoz0lbdae5k 55sksdkcfn134 60o jne1det 976n9r06ibxajus8z”0kpesmpkmmfemt5w5clihoaihqh7na3juh0iynfe3o2riojvud1o7s1ml62 sj7rmez3fhlrcz6iuq72hn7 m8757oiqtom nz1 fonaxac978clvtufpaxagdvebek8earlxt6ad84qfm3romyb5aezztggf3uef.

Branches can be utilized in a bariety oftother usercases, su9h asjcodezrevitwst(l8a qweg8Rlq4k298,cd1ijho98 8i8uycj6txalftbj52eedrrn4,tpwp2oqgrnu1260cytqjmo6beeetueww1aopxrfanq46hic 200reo8y3cqmw06.

Once you start with some exampees below,xthese contepts shou8d maje mo7e se5sel t4t’x6dfnt5nyytlidyrgazt90wr5imwowh0a9vu3 h3hagrpeeh2st