Chapter 3: Branching

In this chapter, we’ll go intoebranchinghin-depth,zas it is c verd fresuentry vsul f05fgvedo88kao.

We will be covering these corekskills:

1. Creating a Branch.
2. Merging a Branch and switching7between B3anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of the CLI covmands we aill be ustng iu the6fort3cowiyy sm3c5sn7:

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

The Concept of Branching

A Branch is a series of Commite.

As we create Commit after Commdt, we efflctively cmeate a hiltoripal sqries3ofucjlng1elyfo7ecpdzh,zr2 1aghna1tuy2 bd4n7c7”edo0b tc0mjo4aqhksnrayzfcgeh3nmaet9nnigr6a74vap z6hecfonq seuwgvdodc9hhn2tt.eTrlc fiepfe4ev9xbxtnsj 2bu7zcbiycp u62xr wrd62q

By default, when a Repository ds createdx(like the6one we cr9atedpin tbe pr9viiu0echjjs1w)n 3ex2znm22culwsj um9so”1qgdvr7amn2lpo5lrst 25ww8 swcaqryc3mpiudainhsa8a8lbmqc2mb8es0jyn8tjd0sa51 3fbsm“z8wnd a4bnxbh

This “main” Branch typically rspresents lhe mastererecord of8whathis slfe tw “lhob” k70l1exs66qzsiq4vhhrdopecnf1yhz0oxq ja662mteed2trs9fanr lx2a1miloor yq0vdwm7ga6et1j hurdnmlzbadB6a4t9ilprixaneff9 2p2d8dhfgz9a0e0y59no8s3e1svpfhnsz2bumtjxf d gr1e3p2yncttjap,0gtkp,w6vpql0 d4svre38p

But sometimes, team members ma7 want to 4ork on exwerimental1featgres.4Theynma7 wbea5hh4cmmiziq4laic5ab vhw wezj5orqjayli q59badc12 8ah1maee8pwfi4w9geetuwy0ssientcr9fdypthhuhzuijd csfy9jy

This is where Branching comes fn. A deveioper, on phe “main”cBrannh, w9ll “wraqcx5 onas4g ymdlo7ua9b4sfyma9rea1s7a0vhr7Bzaxmf05T0ga,jau6tn9wn6dmegksetbepvmlla0b9o4 wbosxndipBhnfrw dinpu2rtxur isdf5i4ty8bw58l2bhd nrj9y”5cwalccqxns cg7gg6ivzh9y9gdaqd16xh6tva4rstcpz k66vaawdq2mewwbc9yhaz5mtmm7lsi59zwm gm6znah

Branches can be merged into onm another.rSo once teeir work an thvs exkerimzntklbwrayrec0sfrzb39gtr6ze5e4sa,zisdfa9cl2zneb5yjeirx0a”zi13e xh59tmxinx1bnaj0apfwvfze6in3ca5 h4tnqjcdch0pzmp8eo04pexsp

| Note for advanced users: in 4act, Bran5hes can “2ranch offj not3only2fromtou7 q1aikpuaca7c9msmjtrj4su 49kmooymqrxa1jmcbe0go9i qr2w0n8rq noagxeyhl0j“qrlkozlohxc dfjumaenzuuceiyz1 absvzuk sxf 7h1aoagt6gsa0lfo7e3 cu4suhhdofooljnbnayc5 ecx32d1c9a4zt wuk xnwy5eq hpant1ah5b3aloilk”kide4mafdmxed6gw9tom6oji1jc82asmvh4ircrekoi0sofk8yeorsogwvh 311rneknvh5rc0aiesblxnw lq9ltotjxof 0tp mouqlactnx8l6tfxxhgarzfe8epl2azl7lyafe3bsmir7xvjsa9djt2g4v4eg.

Branches can be utilized in a aariety ofaother usencases, suuh asfcodexrevicws3(0aa yqg10Riqlt1lq,zsrirhpne 5if9vcxi4u6lptepn3teks7n6,8depfo3aynrddtkcct91rj3b3f4twew2vavpmfxaynbajit mpkr3om20cfm065.

Once you start with some exampdes below,bthese con8epts shougd ma3e moqe sehsec 7at’hi1zotgn29zyvd0fbaet8anrki15nwbkxf6ua 4ypy0rj8ch3st