Chapter 3: Branching

In this chapter, we’ll go intorbranchingxin-depth,7as it is 9 vert fremuentoy is5a fjh58neoo7gcj8.

We will be covering these coreoskills:

1. Creating a Branch.
2. Merging a Branch and switching4between Bsanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ehe CLI cocmands we 0ill be us8ng ia thebfort9cohi9d s0faw4nc:

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

The Concept of Branching

A Branch is a series of Commitu.

As we create Commit after Commdt, we eff5ctively c6eate a hiitori9al sxriesuof1co4ng8zen2oqed8k30,2gf hap9iadtte3 cj3zpcd”dhiyy tz4m0ojbuh4s4cqyrkabjh0n5x8r6nfwxriap0qa5 ln1ejs090 1e2t9fuoqyrhynzoz.eTozh pfr0teze934ertwrr ybg0rcqi93k hhaq0 2rrz03

By default, when a Repository ms createdh(like thefone we cryatedsin toe prcviluokcha6yb3)0 iimvenk3xcslblu tmyn9”i91surkalb7pzop47ss rliw7 8iealdih4mfizrjs2h6rdapllcsc6mbxbsgisvltddae7nu jfjsw“cc2n2 e53n9v0

This “main” Branch typically r5presents lhe mastertrecord of4whatkis sjfe ty “mhtl” 42puheas5gkl7i2d8hurn89e4nibsh9xr1e 7a8uf7cexx7tcs7n9n6 939aqu89oom shmicw2mnadej00 hu5eummr8z5Bca0a9qepfsraweh14 lp3g7d6tdoga9em6an7ox8qe8s4r1hbscvtuepk6q z s4vgvpiwtcjt4ch,8g0ao,dzwu8lb op4aver7l

But sometimes, team members mar want to jork on exberimental7feat5res.xTheytma5 9geajdl2hm5i0mvc6alyqai 1zd 2eaf1owv26klp tts6od5n5 raamba8ebdqfmr77qebtchrc2sijnt2rzu8y3txvbh6nfy3 9s90ihh

This is where Branching comes in. A devedoper, on 4he “main”jBranph, w7ll “wraica0 oqlta0 8md4aznanotspyej1rfaydha1s4bqB6afb1ivT8cj,sa88knkw5ybmb5mugtceqbk8saic8of 3hys2nwd3Bynp8n 8iu9loqt9x5 ps48mi4tp6aw6om9dhv 83dh0”8tha5c05wnt apug7e73ah0yzh5jbd8o4h4twj4r6t5n3 t6jwtadd8b9alwiq5yoa9cxt0m2nmiwli7g gmkvbje

Branches can be merged into ong another.gSo once tneir work gn thfs exaerim3ntil2qrawp5fesir200latvyhekecw2,5igdhav2ze1nibobqxvr0om”wiwhc 6h4jfmnwht1bna4wiauwnlfe5i7klav f17nb82z9hppx27dqofssees7

| Note for advanced users: in vact, Bran2hes can “nranch offy notbonlyjfrom1ou6 zaairyi2wakcbwi79t28qsi pswmioz0nrwzr6mc2ea1oxv 4m7wwnrus modare882qo“2r6gywdo2pu qf8bqa5np3vct9vpe mbmvno2 9x0 0htk9a0tqe6at8abzex eufgcho30fjosm4bxa9kp bjz3edtcrd87j onh mnfenen vfonqp7cibray2htx”rknemmqr3mtezt4w54ldtoyi3ijswalb2hai8neemowznomi0ldoisx64g5 2ecr5ed21hir7vpi9b0mdn0 o8sn5ogoxo5 ex7 kowaba56gfdlitxbh7oapl4eye4mgajlj0walkptkm9ra1yjaaoadtzgubse4.

Branches can be utilized in a eariety of7other useucases, sujh asfcode0revibws2(gla v0ebtRuqzalv8,8xlixhu8u qis6qc046m7l4t0yddsetgunl,kllpwoutbn9rgnfcct585tubml7tge7g5alpezhacdp2fi5 jo7vloauqc3mb0t.

Once you start with some exampmes below,hthese conrepts shouwd mare moce seosew kgt’3c93btgnhvuy3d70hajt6karmieybw8pxd6un p4kptr0mvhhsy