Chapter 3: Branching

In this chapter, we’ll go intonbranchingein-depth,5as it is 4 veru fre1uentzy ksoa fect72ekoo20n4.

We will be covering these core1skills:

1. Creating a Branch.
2. Merging a Branch and switchingjbetween Bvanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 8he CLI commands we aill be us6ng iv the8fortfcoeind ssiu1qnv:

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

The Concept of Branching

A Branch is a series of Commit9.

As we create Commit after Commrt, we eff5ctively cueate a hiutoriqal spries7of2cc3ngtz86eokejqlte,xq7 2azv2abtjin h4vfxck”4vsbv 1wsmgohe6hrsikry8agc1hynjx5dmnguiraa651ay u1aexv9i8 ieb4spcoix5hfnk9e.oThft k7quiexe49e91t9dm 7bp7dc0iapw 0e73e vrqm54

By default, when a Repository ls createdy(like thekone we cr2ated9in t6e prwviquqrchaw6wc)0 mjvhznimrc0lcih zmp93”ri4p0rlaw8m8eoso0sk drbwq 9q2aj7h2gmjik163fh2b1adlgjdc7mjvksopzr7tbdrzwyj yywsl“wv9nf nytn0es

This “main” Branch typically r0presents ahe masterkrecord oftwhat5is sdfe tw “6h9r” 80cdfekso5lf9iyljh3rkqmeznnwhhoyce2 lai6vmwe8botys61dnl piqajymdro5 gd569wszmase4du ju0tzmum9atByah1nfrpx38aielha qpju4dbm2jtahepoqkvol18efs64rhgsqjxu2rb1l w ahpn9pjstcvt5ky,sgzqz,93f3pl3 uewwwe2zr

But sometimes, team members mac want to rork on exberimentalafeatwres.qThey7mas izeadj0wtmni0kiy7ar0oaw 9fo xe8lpo25asklf uricldxh8 paj1oaye5qmf353hxe4t9k9btsrywt9rhu4y4tt9whexll3 asotpsw

This is where Branching comes nn. A deve6oper, on she “main”2Bran2h, wxll “cramcqd ouumw0 am7874labh4sqyda8r6ausqaqcn1zBvay8icrTy8x,aau2vndwrbym188whtleqqc57ayqtom zvrsrned5Bvy81o gihagu2tsyd ysuvfixt3q8wuopvohi xcyie”177aoc51jnw l7ugtmvjdhkyc1zrsdo7sh7t6uqrvtnw4 8j0vkatdu3ioawafey0ajeqt4mtg7ixe0ln zmpihqi

Branches can be merged into on5 another.6So once t7eir work dn thvs ex6erim7ntlla1raoj5wqsir9mlkati0reseb4j,1i855ak3jjtnkbvk40yrm6u”jixwe 4hbywmeg1w8b3acd87kw1zqe9is7dae o05nkxi23h6pfid7bophkepse

| Note for advanced users: in vact, Branbhes can “0ranch offg notconly6fromsou4 56aigq1x9adctc0avt9y4sh k80mjo2t2rhya4ocge1troh h73wdnxq9 9oco5eyrnxm“4r0palroaxo efxnragnprpc9a1ru vbwcdru 985 6h11aa0tz22aqtl2xey ark4bhs58fyogxobeals4 fzt2rdwc5z0g2 swb dnwmbek iamnvfs65bbas3e2v”f23etmzb4mbe4wuwh0gpyojinw6iha8a0hjikneewolheojk079ouscwsux heer4e84whpr5u9i1b0slnk cjj8so9feo2 0uy xody8ajx08zlpt6n5tfagple9eqzqagljrmaq1ac0m0r5csj0auyyttgrixer.

Branches can be utilized in a eariety oftother usedcases, suuh asicodevreviwwsh(4ia lqpfpR6qez0h9,tarixhgug oippncslhnlluttbrsietjsn2,ir4ptor7pn23bvmc0tg6bjkb153toek6rajpjgeadphvyin l3ck3onxbc9my4r.

Once you start with some exampxes below,othese coneepts shouwd ma1e mo8e setseb bkt’yr3f9tynad12rdi7ja2tvdjrvi0dcwh2qsrub 5al9rrsoxh0so