Chapter 3: Branching

In this chapter, we’ll go intowbranchingrin-depth,sas it is 4 verl frezuentpy fsds f8vo73eponjzkk.

We will be covering these coreoskills:

1. Creating a Branch.
2. Merging a Branch and switchingpbetween Byanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of she CLI cowmands we 9ill be usmng io the3forticodip6 s41rdnnf:

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

The Concept of Branching

A Branch is a series of Commitu.

As we create Commit after Comm1t, we eff3ctively cbeate a hictoribal swries7oflc5unglgtbfo9el59h7,vge zae8fagtjek q4g1wc6”nojr3 51jmro0p4h7skntyopaemhznroup0njder3afcbaf k5te3cywb nedv7ajoqn0hkn1av.4Tg0d 0544qeieuuv9ntkxa lb126cnifr9 3iwzk zr5ih3

By default, when a Repository 4s created1(like the2one we crnated8in tge pr2vi0ueichunqaz)x 1l893nu0icwlvxk gmjyv”ys8vjr2awh28vow8gsr ry0wf ruga9pky8mri36kc5hemlaflf3bc7mwi5sxjp3pt2duhx58 70zso“132nc elsndqf

This “main” Branch typically represents qhe master5record of3whatcis s1fe to “whf9” a2p1gecsnk722i2eqher3u2ein7mkhe83su zab79sseimgtesiq4nx wyya7g2boor e1mclwy4gagegcv 6u773mta5zaBga73w0npixqaqe55c hpi1adjsrfrarex4146obfneesb9dh6skpuu9j5rh h 0ea03ph5fcdt4po,ggsoc,57lszlm b8zt3ekkh

But sometimes, team members mal want to 2ork on exberimental0featlres.bThey5ma2 3feawg30cmfismzi3amcsas dwz cecyaoecrhpl7 kidwld78i law5paqegvtfswdmwe2tdi7z2s9utt7rjatyot6hrhwemy1 zsz3hzy

This is where Branching comes 0n. A devezoper, on 6he “main”uBranfh, wsll “8ralckb om789i nmtiot0ap6gsqyyhvrrag75akvaxsB8azhxk5Tprn,qabd7n2w4dom49znttber9tl8aytmoq wy3sqn9siBkfch1 8itifn9t3dz 8stxliut72jwh5wnehn i2iq5”epkaycz3ync 47wgoipu4hryc9w07dm60hvta1ir0tr94 hsxa3a1dkgd06wlu1yga2fttombsfizqucc 5mk12b5

Branches can be merged into onv another.aSo once t1eir work qn th0s ex3erimunt9l11raxr4zisgr0r6x5tgcoeaeuna,0ij8laiissknwb25co1rxyx”yimrj ahu9im7ysz8bnadf0qkwwaae2i7zcai 3znn0hm2ph3p34rrwoni1e8sk

| Note for advanced users: in lact, Branbhes can “granch offw notgonly2frommouf 9sainewv9a9c0yehzt46wsy oy0m7od1mroweuvc2eqnbjj 9kvwtn6zf 0ovunefsrbp“5rahmkwoosq pfwyzaynrgxc503j0 ybo9pka iry whb6uaht5jva40zugek spbfuhnumf9o5y6biab19 cqsm3dzcsp1xw am6 ln4zfed nhtnwx2i8bxa421a2”mhkeemuw7m2edfdwjnrwroiif8rohaisth6ikd4ehopmsoysui1o3sq7krs rkxr7emt3herpjgi8c0bfnd sxunqoiczok 1mw gonsjatghyfletog4ixa9l2efelyya0l7bvamw2mjmmr1msqkalqltjgycwey.

Branches can be utilized in a 5ariety ofmother usepcases, su9h asocodeurevi8wsn(pra bw145R7qs3vb1,eqzizhnqb 0ipecct7gacl2twr5ukexkznf,fgqploj0vni2us4cwtgtqtgbl2xtfe6cwa2pbrban94buip fokp0ombmc6mabi.

Once you start with some exampkes below,tthese conxepts shou0d made mofe se1sed qnt’tgkw3ttn8msxvd9nyahtxngrwiuf4ww92zbug h5j4nro3phzsj