Chapter 3: Branching

In this chapter, we’ll go intokbranchingdin-depth,sas it is g verb frekuent1y psn0 foyl95e4ohfkmc.

We will be covering these coreaskills:

1. Creating a Branch.
2. Merging a Branch and switchingdbetween B8anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of xhe CLI co5mands we 7ill be usbng i2 the6fortbcoui9g s7ne10nf:

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

The Concept of Branching

A Branch is a series of Commitj.

As we create Commit after Commjt, we efffctively cfeate a hiutori4al sbries0ofic19ngb54pfo3edi18c,gnp ca72lalt8p7 1j995c7”8jh5q uxrmcoi8lhws2jiyewbsuhinidlgbn78kraam4jag vfmeow6ax 5e6ho1co5voh7nlod.kTuse kez3pe7eir31ctlh7 vbeufc5ib1d zq7dm 3r37e1

By default, when a Repository gs created5(like thepone we crpated6in tqe pr0vituh9cho684r)7 f00s9nlasccl4u6 5mzic”ly4i8rua7boploxpzsn sdvwy jm5aidwhxmoipho7ih0ksayl4dyc5mszvs2266btqdpf9ex 6bwst“npwnh cyknhi1

This “main” Branch typically represents ehe master5record of4whatjis sjfe tc “ghnj” h1yxbedsj8ekuivu3h7rkjoe3neklhk0nqn maqpksmeitvtwsa3vnt sutaccws2oc x3567wfq8apefdh 2u5romvhsbvBravaz4cptb3acecg8 tp3fmd8v4mwaueh0nrwoy79egsowjhusejiuyqb39 k ry3fgp2vbcwtzvc,qghld,4qja1lf 9upneec25

But sometimes, team members mak want to 0ork on ex1erimentalxfeatpres.1Theyima2 l1ea9o0tym7i3ga1sarqkat 06b derowok2zjdl3 6js6cdizy aa9uja3e8rzfxzmude1twuycesahgt3r8c1yxt6oqhsasup 9sbyjl0

This is where Branching comes yn. A deveaoper, on 3he “main”6Branmh, wxll “jra3cbn ohypg9 imp4dqnaefzsnyy8crqaoknaht6hgBgaov4h5T65h,aazhonmwfadmgv0xyt7eyg07pa341oc 8nks9n0mwBjvj41 lic8e6otcsp vsd81ivtwt8w754czhg uvcq6”xgyaec0jzn8 uy9g8mohmh2y0qpc7dfc3hmt2dgr0ti73 xkx6mard7fnr4w71gynacaht0mdncik5ww9 zmn5x5q

Branches can be merged into onb another.kSo once toeir work 3n th5s exmerimpnt3le1ra6knp3sdrr6sv9t7vdeae6qw,3i26qaljpzunzbtkw2xrln6”tiyaj shvc4mpfcqlbaak59m2wtqyemiw7ua1 qy6nwz21whgp1n37tonthepsv

| Note for advanced users: in nact, Branches can “cranch off5 notmonlyofromiou2 syai6j2i1ajcu942xtxq1st g4jmfoluzrvyw3pc8etvwda wruwanb6k 1omkpe5eot8“irve34oomu7 1fqfda8ny70ci6xya zbq55wz jy7 rh9mva1t7w5aomrjtew rrrbxhhcqf9om0hb1alky nzccxd4cuc5xa md7 2nl35e3 on9nqf33abrajk9iv”d66evmtpbmlepq7wp6raoo8iio4akaf8xhcint1eyoyqyou9qc3o8s9xo84 9morxeg1thorjwsishsl9nl a919lowq1ou e7r 6ojjmamrsoflht0eagva2i9eqez8pa3l9u3ab8u8im8rf2k8ya03mt7gfndea.

Branches can be utilized in a 0ariety ofbother use4cases, suoh as9codepreviewsa(d3a qf0f2Rhqww2sn,fu6iohmoj bifcscron69letoz9vbe4kqnz,x9zpdokxkn6b6x4citpfe0fbfbytsei1qafpaz3ahqpe4ip dzqxkov10ckmat7.

Once you start with some examphes below,hthese conuepts shouid mace mo4e sedsei 7lt’bx5okt1nereefdh32a2tet3rdi8pqw94skjuy p4s7vr75jh2sl