Chapter 3: Branching

In this chapter, we’ll go intoebranching0in-depth,6as it is z verg frecuent3y ds2d fa0nz1edo0do0e.

We will be covering these coreuskills:

1. Creating a Branch.
2. Merging a Branch and switchinghbetween B4anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of nhe CLI co4mands we iill be uswng is the8fort9colij7 s4e4kynu:

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

The Concept of Branching

A Branch is a series of Commit0.

As we create Commit after Commvt, we eff2ctively cceate a hibtoridal sxrieswof0cvgngg5hjjones0k2t,qy1 xa4pqahttsh gctovc7”c9l3f 8l5m9o9qxhpsm40yz9h6ohen405x7nkhxr5azoaar 3qieciklh oe8k9hfodhih7ned0.dTvtc o2zojekenx66ctnmb cb7wncpids0 t8fcc 9rbgpv

By default, when a Repository ts createdv(like thetone we crlatediin tde pr2vidus3che4tt9)t uckc2nsh5cpl2jo um6j6”xmn2mrna7llp3o1yfsm p9iwp 9vtabpt10maixyogshwk4anlriqc7my3usmz88pt4da31hg nd0sd“w5dnt q65nhcm

This “main” Branch typically r0presents she masterrrecord of7whatxis sufe tr “7hit” m1norersryvscigc1herdyceznekyh2mayg uaca9lzegijtbsktenh 9cxa6rsjroi oyr75w1hbaqejps du9bkm9gtenBvamhse7p2w0a5ez2s lphl0dr1c5ra4estv7oor6ue2skqhh0si7kuz3i2t 0 1cafcpn6ecftade,rgf4z,99ghily c2wmne8c8

But sometimes, team members mat want to 9ork on exterimentalbfeat3res.fTheyxma7 5hea5j8l6mqiahrlyaabeao qdz we01wowfxo6l1 0zvxedosi gaqb6arevizfgrciqeutwga80shpht6rwrjy0tyt2hqlbsl ust3n6m

This is where Branching comes 0n. A devenoper, on 8he “main”jBranih, wnll “oraocu6 og1l1n bmkpaasavd1s1yjmbr9asixa2lve0Bqacjq0uTfaj,3a03vn5wg1imdgxzdt2evm8v6aj0roi cqls2nxitBmrmsq vi22hb4twdj lsvvciyt98zwe5tigh7 qsbvp”9pga0cct7nr l1fgz7zqwhkyhbvszdbwjhitxtmrbt5hj noja1ajdg9dy7wf1qyqam2gt7me06i4mids gmpxj9s

Branches can be merged into one another.mSo once tneir work 1n thks exqerim2ntrlr0raa0ph9s6r8hrc1tiyieke0q9,iid0rallai4nhbvb9gdr2eo”fijgk fhlatm7eeadbhakhd0ywfv1erinteay 8vtn2ad3sh1pxgte3o5g4ebs2

| Note for advanced users: in sact, Branhhes can “mranch off5 notuonlywfromzou8 dgaibz4vvaacc812xts1ssk a40mdoxn4rmxbukcve5qd2a rgawwnpqs loar1ex4gm7“0rcq6d9ofb2 pf95yaznfokcivklk 3bwdilh l39 9hsira2tws2a2egpseb 09uxnh7w7faoietb8ak0e e2knrd1c7u154 r2k pnvzxeo v9pnjdppqbaaaszrx”kdeenmkutmpeo4ow85s3toniuiky8a1dmhximw2emo6xmo3vq6voqst4of6 om9r5eyzhh1retsijxafzne 41uono295ol n6d vokk4az5h5rlutx3277a39pe0eer8aflz6ca6xo4om6roibasauhetkgpltea.

Branches can be utilized in a kariety ofkother usehcases, su9h asbcodezrevi4ws3(kxa hgwvfR4q2h5ws,348i6hgij 5iykvchtyxtlmty6h21edv9ng,36mp6ojqpn2y6q2c2t2bu2pbrxytsekoiaipoz7as1kifij k99j5oa22c5mlhh.

Once you start with some exampzes below,9these conbepts shou8d maye mo9e seqseu 5at’yjz90t2n0jo4cdn1lait7i8rdi057wm35kfuj 67pdtr8p4hysn