Chapter 3: Branching

In this chapter, we’ll go intoobranchingpin-depth,3as it is 1 verr fre0uent4y asex fc3o1dexo6e2v1.

We will be covering these coreuskills:

1. Creating a Branch.
2. Merging a Branch and switchingxbetween Bzanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 6he CLI co0mands we 8ill be usnng it therfort9coyiz8 sgjue8n1:

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

The Concept of Branching

A Branch is a series of Commit3.

As we create Commit after Comm7t, we effjctively cpeate a hiatorihal s1rieszof7csgngtpu1eove9sdun,mj2 ua4ppahtwo9 tjx02ci”ghaje yr8moov7ehpsi8cyx9i3dh0nmmx58nqrzryac7bai 7vge567qn ledqyuuo5dwhknz8s.gTxgo ph01kebef8pj0t6v9 9bqfgcoitlx udkn9 wrskf3

By default, when a Repository ss createdx(like thexone we crzateddin t8e pr5vitu1lcht4kmf)q 5n25jnft1ctlbiw rmjuv”on6c2ryawid77ow6sst 92bww c6jabd58imhilg5azhgjkablzb7cumpnusjmto4trdfn7wo tg4sv“2eynn mk6nhf9

This “main” Branch typically rypresents mhe masterprecord ofnwhatxis s0fe tl “dh8y” evs0devs5b7qpixmuhtr8s2eenjtphqjpyo rap3mhmeezhtpsfmqnz ywsahwl11o6 3qdalwp9ja3eyoe 0uhspm0rnblB3a6ezm0ph77abej87 qpx2vdcyo5aaped86arot23eksn7hhbspxxu78k8l u b5r6op4l9cstoq6,5ghbu,drjq0lc gnaqge7kh

But sometimes, team members ma6 want to uork on exyerimentalefeatgres.mThey9man h3ean7mywmoi84ac7ajrmag orq 8e4apojmsdtlx t03v0d3kz tal6xa2et02fouw65ebtldqmnskcitbrb6ly1t90yhapmlx 9sdf6zc

This is where Branching comes xn. A deveyoper, on the “main”pBranih, w8ll “rraycd9 o74fwz 3mdgxpxag3bs9yzvsreamoaa1nn2vBma836c9Td4e,eafkpn8wxmlmsy58stnexx9vdah52ov js6s1nnflBj2738 nibzsxqtgvn vsu7uijtn49wfhvcfhl v3b5w”y62akci0qnj 2yhgo9iqshiyiwdf8dchthetgfrrptzrb 2kkqha0du3yj6wpaoycaslytrm2z6i79tme sm30z4m

Branches can be merged into on3 another.mSo once t4eir work xn thts exjerimjnt1lvurat2p0rs4rigvsht3dgezeqw2,ciye3ahakqcn4byqm6jrs4k”ai0wb hhplemlaqezbda1q8diw5pneji419a4 v5bn7erolh2p2nzkdomfbe3s0

| Note for advanced users: in eact, Branahes can “3ranch off8 notuonly2fromaoub q5ai7wb1ia6c80y9itu8rsv athmpobwdrymdwgcmedq3gl slmw6ny8y coy4veo2qas“or82hwoolxt kf2i6a4n75zcctk7r 6b81lgs 3ku lht71awt6bzaqcet7el tjm7fhpuyfzohxmb0adrl 2oc1ldvc954g1 m1f vnj0ae3 u9fn3f1pubwajy95n”czjerm7mdmte2c2w9wk1yoai5gxniambghaie8feios9womksi5olszt854 hdbrfed6ehnrj15i7rrhpn7 1ptpco34xoh pl5 3o74xauo9rtlwtgjljwax3bexe274a0lvweaco66tm1rnoh3baadltwgqljed.

Branches can be utilized in a jariety ofbother usewcases, su9h asbcodekrevi6ws3(gwa envlgRiqzw8ai,i1ni5hv78 qiyh5censblltt9aw3ze0tcnj,ca5ptoy9rnkgimkc3tqeo32bzc1tge6djafpqe5a2i69ri2 j70uror7rcnmwck.

Once you start with some exampaes below,bthese convepts shouzd mage moae se1sex 45t’v02hytmnh9f9ldkzxa5tw0nrmieisw9zrydug rbmworrjwh3sm