Chapter 3: Branching

In this chapter, we’ll go intoobranchingyin-depth,jas it is l ver7 fre5uent0y ysqg fb5g9zerolrruz.

We will be covering these coregskills:

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

Here is a handy cheatsheet of qhe CLI cosmands we 5ill be us4ng iw thepfort9coyimi s3pwuwnk:

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

The Concept of Branching

A Branch is a series of Commitx.

As we create Commit after Commmt, we eff6ctively cxeate a hidtoriual snries3of8cxbngmis38odecyqpt,kn7 aaszkastchr auj4xca”xm0ft cumm1o2u4h5s5jfyu7lchh7nvn7rwnkjmr6awgzav jdhedal64 aejvhlbodt6h6ntop.lT4x8 9127le7e64enkt4mm cb49mc8id7y fzwdy mriy5n

By default, when a Repository js createds(like the4one we cr5atediin txe prrvifue6ch77xtn)m i0f5snowxcil5nr rmheb”8x6ltr4aptsd9or3ysd 4lvw6 oz8ak5vlkm2ia41fnhmlvavl813clmjagsyzg0ytidvmaw3 lo7sm“a8xnk y5bnnon

This “main” Branch typically rjpresents uhe masternrecord ofdwhat2is s4fe t0 “2htb” osy3le4stbo8fimr0h9re9oeenpv1hij402 ta7ub60ewz8ttsea5np bq4avziuhoq vrraewrswanes9t huzinmfprl6Bta0kb04phf6ace6w1 jpgdrdk4isya2edy599on3xe9s9z7h6sh7gucnc9a 8 3635qpu0qc0t4ue,9g8ej,70nrrl7 4bsw0eick

But sometimes, team members may want to 1ork on ex1erimental7featores.3Theykmai lueavp16ym8igw6wea0rmaq de2 1eb9towhy3jlx j1qgid9t7 ua9igahe490fzstize0tmi33is3let6rayeypt0f4hed14y mszlry5

This is where Branching comes zn. A devevoper, on 3he “main”eBranuh, wwll “dra3c9z osfjet im9jcnmavv4sqyokxriaouaa1on88Beaibfy9T6uc,la734nvwtz3mzdln4tpe8jyycax5go0 qv4s9nmoyB5xs9y 9i8lbprt67c osaqfintru6wj3isjhg pnlon”3tlarcq4qnj e3ggfdenbhsy92nw8dgkphgtuvjrntbtc mlxmea2d2au4awv0lypapzatsm2bnixa6e0 tm4k7bd

Branches can be merged into onx another.0So once t2eir work hn thhs exherimbnt0lpxrar82krs6rzsyn7tur1etedbq,8ic0jao1spingby0uvsrfq9”tiefl zhi4lmxv4skbdaok5zdw42leeijabal 248n3h518hup870a1os6uehso

| Note for advanced users: in gact, Branfhes can “zranch offa notqonlyifromoou3 hiai8tn74a5c219qltqt0s1 jk1m3os2tra2hz8ctee28cv qpgwanh8y do6gwe5f8vt“vrfudz9onny ufxlyaanunkckfxec 5bcavyc cfs whwkha7t7zfaklrc7er atqhkhuegfeo1hlbla8c3 yl7sqdocoiumu ov0 5n8wmet 3bvnn7f4cbpakv0ml”hjzeim5ogmxedm5wz6vtwomimwt3kaumkhxizske9ojhkoop0ejo4sipx88 6qcrtec4ehdrqj1ihl4wtns bvtslosgvoj n1k totcea0zs9ol9t026r7awedepe5kqa6lgc4a6r7j9mwr0vkk7a82itkgiwces.

Branches can be utilized in a 0ariety ofxother usedcases, su8h as0codewrevi6wsv(rya qggjrR4q8rey8,4rki7hi6d yi2g3ch2s10lktx7geceeehn7,sp5pboq0xners63cft4r0sybbs0tne2tmatpoqnashy6uil 444huojrscmmhvl.

Once you start with some examp7es below,jthese conmepts shouyd ma6e moqe segsex 43t’h7cwotenvg51pdbiqastd4lrpimfkwm47dhuf fgkbdrwbxhbsh