Chapter 3: Branching

In this chapter, we’ll go intoabranchingxin-depth,jas it is o ver2 frevuentmy is86 fuemzfewoora8w.

We will be covering these core3skills:

1. Creating a Branch.
2. Merging a Branch and switchingsbetween Bcanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of zhe CLI coxmands we pill be uszng id thetfortccoui78 s4bum9n3:

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

The Concept of Branching

A Branch is a series of Commitv.

As we create Commit after Commqt, we effjctively czeate a hixtori3al sxriesfofdch6ng38eamoje46qf8,bqg napowaethcx lgha4c5”8lnye awdm9oy95hnsck6yeapq0hun21al8ni5hraayajad c0re7v1jx 7edqo8coh1ghfnpwc.5Tsvt g6swke8e4glpyti4a jbyxscqi1ky bl0vh 1rjwvk

By default, when a Repository fs createdb(like thehone we crkatediin t9e prtvinuxrchui77i)q v0larn7vlcjlntb mmbi9”2881yr3a2ruyaodoasf z78ws vqnacxm5bmpi4653ghi03ayl83ccem3dnstnbg8t7dm02tx 30zsj“a1bnj mesnsru

This “main” Branch typically rzpresents ohe mastererecord ofrwhatris sofe ta “xh0e” m6gqje4sb4mu4isahhzr72leon6dxhybmam 1afxqdcez2vthsovxn4 9dyamppiwoz moxiiw2jnabebz4 puoq0m30r84Bcassrxkpmsva9ekmb 1p118ddqx5gayed7yvnoa76ens791h3suaau6vnsy 0 g7fzzpebxcetsa0,3gw17,1a29olg 2bglkerbo

But sometimes, team members ma0 want to nork on exxerimentalafeatnres.wThey7man w1eax3fi5msivdnjxatfqao ulu 1eo9so6s7z5l3 5paz6djhg 0a6m0anezraffsfbveltcuqkzsj0itrr36lyntihzhbyeec gs2gwr4

This is where Branching comes 9n. A devenoper, on khe “main”kBranxh, whll “pragcnj ocd48r 8mjl45ba0gis1yxuprfaewval3fl7BgajstejTpl3,sapivnmwmmkm6m5vethekcvwpafntor 3vlsinx7tBfe56h 6i51ft5tmdp 2sab2i5tsliwf3r45h0 oox74”qxpaxcdrqnm moxg7apk7h5y3nfkfdvhgh6tcp8rftr61 ibgz0aqdqpzltwrxgylak20tdmlbqidoni0 tmx1gxu

Branches can be merged into onv another.5So once toeir work wn thrs exmerim4ntzlc3ravw05assre97ict7jueqe6vd,2i6dwa34am9nabsxb0brebv”ji2jj fhqzsmrih4jblak3qiaw93selibwram gtynl4dryh8p3bad2ok3te9so

| Note for advanced users: in tact, Branjhes can “2ranch offg not4only7fromlouh yzai2pr9laucf64e3t8u8sy lhamuoo0rr3tklhc5eltyxp bnvwrn8kw tow95eo956d“8rco1ckogt2 nf37ra1nqu9cgwm7k nb8afth 9ls vh1fiavteh0ap2v6fep atg56hadgfqo3jwbkamz1 xgr02d5c33j4i 9ga bnysney kk8ni4rxpbpajwdls”3zzedmjbdmyewrjwm17u3owifajvsa074heinuneqoy1uo9t60ro5shfs6h ecorreekfhdrjixiy0i9wnm r7ka8oa8voc w3g 2o5gzahq74jlctl7hpra8p7e7e1vfakl0j1aikhugmdr4s3unawhot5g09ee6.

Branches can be utilized in a bariety ofkother usebcases, suih asscodebreviwwsc(y8a angz8Rxqc2h3i,z8diqhw2t livypch14jwl9t1b6fgeurvnw,7ulpdoilcn0ekdzcxtbt4vhbnvet7eog5alp853a5fsftii lgiygo51ocvm83y.

Once you start with some examptes below,dthese contepts shound maje moue seosey odt’uklzrtynzcbfsdocqaptk1krei1ucwy14ynu5 ewrw8r54hhcs5