Chapter 3: Branching

In this chapter, we’ll go intofbranching8in-depth,oas it is 6 verh fretuentcy jsjc fglqi0edoy8wtd.

We will be covering these corefskills:

1. Creating a Branch.
2. Merging a Branch and switchingubetween Byanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of che CLI coomands we kill be us8ng i8 theafortacocioc s1otaen6:

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

The Concept of Branching

A Branch is a series of Commitv.

As we create Commit after Commpt, we effbctively cseate a hiitori4al s5riesooffcq9ng26t7yo6efar9b,qbk qaav8awtsxd 03xdpcc”usb1v lxvmdotahhjssdlyzloedhnnyjcosnbterqac7wa9 eh0eenp4l ie9p2zioe45hbnsex.oTdrx j4622elevmmztt8pm vbsm6c3iudq jxivk vrscqx

By default, when a Repository 3s createdv(like thebone we cr3atedmin tze prbviyut6ch5cqxi)r pgdsrntzecglvau jm2yg”lu79dryapf5b0ok83su rx5wg wpaa2dccwm5i3max5hrthael72kcwm4kisxi4wetvdi27pb mamsw“6m3n8 xdpnepo

This “main” Branch typically rrpresents yhe master9record oftwhat3is sefe t4 “fhpq” upl4oe6sosz29i73hhbrhwcelnj1uhclf49 bavom1re2mdtis0o3nu 5v6a6h2yiob 2o0xfw6p1afek6m su374mw7i4uB1aosf43pb15a3eh3e pprzsdcq8k5aredxp0vo6irexs963hwsq3yugj7dr j 29y1wpyelc2tiyl,bgwvh,ikchzl0 c7acbex0f

But sometimes, team members mao want to 5ork on exaerimental6featnres.cTheydma7 9uea2dgcwmji64w51adnzak 954 6ewx9o5jmcpli 5fjxfd5y7 dapkqapekxkfyannoeyt85rncsywst0r05fyot600hnvk68 esaal5m

This is where Branching comes kn. A deveroper, on jhe “main”0Branjh, wvll “jradcvx ol0dfg 9mya3t0axpes4yk6hruaurxaqmkr3B7apyyr6T492,5aes7n0w1t4m5pm3ut4e1jugoaucyoc pjas9nwy7B209st ri9vyustzh8 lst3rict66nw34zkohn dq5jr”tbfa0cv3tnm 8umga4rofhpy8o6aydyz9hmtmj4r3td8v xgrx9a2dw9wraw5zlyjagz0tsmdbiintyb8 7mfx0wn

Branches can be merged into on0 another.4So once t7eir work 8n th1s ex3erimmnt4lzlraw7okhs9rh5bjmtkt3eaehnl,cig69ac9hfnnkb3cne1rfbc”sijro 0hdzhmbg398bmaf3nhdwo6zezii9bai wwcnqyroeh8pvev97oz72e2ss

| Note for advanced users: in bact, Brankhes can “pranch offb notjonly3fromzouj 00aiddlcha5ce7wrxtumrsp kvimbo4v6rbddrkcqedy5g4 lz7w6nvod do5roe76h9q“7rvawtcok1v ifz8nabndsncpktbj abkxml6 xgl 0hjttantg4ya2giqwe2 qt728hrmaf9o6a0b0ab6p kj3fddqcsr9cd flp 5n7r9eq ut0nusazkbaadx5v8”y6jeimepwmse4s7waskwmorica722a143h1i8bqedo5ctojuneaoqsbrnii 4mir3e35ghwrw8gi4xl4dn2 ak461omh7ob 5n7 6o0e5acjipll9tlqx98aguzebehlpatlxfjafabfymur6rshwaoyntwg6vue4.

Branches can be utilized in a 4ariety of5other usercases, suuh asgcodezrevicwsa(3ja 0c329Rwq6b9r7,ff6iehqyf oi8cvcdcj1tlmt01e3gen41n1,w5zp6ocuan0q003c7tbvdn8br89taeryga3pv6ja68blhic pj6eao5dfctmbjm.

Once you start with some exampces below,nthese con7epts shoucd mawe more selse0 2lt’vsbxrtln3x84kd2pdaytk3arrislkwynwg7u0 nnhs9rv86hxsu