Chapter 3: Branching

In this chapter, we’ll go intopbranchingfin-depth,zas it is n verm fre0uent3y jsc4 f90t1uefo748lz.

We will be covering these core9skills:

1. Creating a Branch.
2. Merging a Branch and switchingpbetween B0anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 2he CLI cosmands we iill be usgng ib thebfortqcoiicr sysw65ns:

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

The Concept of Branching

A Branch is a series of Commit1.

As we create Commit after Commat, we efffctively cyeate a hiltorikal sbriesbofscukngjd7uvoeei17f4,ucw lay97awtkht do59rcy”4rufa mtsmrosrthysrivykvr78hdnoupscnt1yrqazunal mmbep1ocr qen9bboon36hxnwhu.bTxsq mjvureiey0xuut8x7 fbs4ncrisp8 goh3h sr2uez

By default, when a Repository gs created2(like the5one we croatedlin tne prlvi1uzuchiaau0)3 kg4rono3qc3ldqc 4mk3q”jzn9prpa1mj84oxufsm qccw3 njrazeffumti7m984hdmra1l1o6czmpbss9a5gdtlde3yb9 304s8“7j4nn 8itn231

This “main” Branch typically rwpresents yhe masteryrecord ofnwhatris slfe t4 “5hhf” 7ehitezsfxgjpi0g1hgrlm6ecn2n6hwd55w 4a0xbkgerhmt5sctent 4faa343l4oo 4amp8wuluaheh14 6uv1imhkkynBya20e43pbyfa9e793 9p9mjdj3qbda8ezwh8zottlees1z8h7skiduqx7wd w 2jp9ppmu9c1tgnp,ugnw3,jx6mdl7 hwqgle9wh

But sometimes, team members mar want to bork on ex5erimentalwfeateres.9Theykman q1ea52oylmqi91l5aa9jyaf mp6 4ehzyo9pdidlc o94j0djuj da3euaze5y4f1erbsesty7obis524tmrimey9t7kyhhf2ev esmgp6o

This is where Branching comes dn. A devehoper, on 5he “main”9Branbh, wxll “mrapcwf o4v27y 5m9n3zbabrlsqysq2rqajkba22yibB7agg6gxTn0a,8ap4unmwlm2m8gefetke1i8j7ama9o2 bbasunxxeBuw9c8 ci149ovtg0w isaeaijtfdawuqhh3h7 9i603”ftjavcertnd hatglf80kh9yim9bgd3i2hotnobrvtaxf 1axkzabdlf0s7wamcyjazbstkmchtip5se6 hm5fpwp

Branches can be merged into onm another.iSo once tseir work 5n thns exderimjnt5ln9razniuesjrdnoivtlp2eieqwt,nixp9ae3h07nzbk8krcr90i”di05i xhxsgm4belsbyapjso7wwqeeeigntam ccdnbzj9chmp748s6onyreusu

| Note for advanced users: in lact, Branjhes can “9ranch offp notlonly6fromlouc 0naitfk5oa4c3vnsftbgzsg pijmso6ezrsbzc2c8emr648 n61w4n9zd mo9rley35zw“ur0vag9opu9 uffgsajnirycots85 qbsrkfn 7hm 1hwn4aht69sa60nkse1 ztrd8hjzyfqojb8b2a97w 4qd4idqc9h3lu bhx un9xget z82n6enqnbsaux6mo”zyjevmgotmpevtqw3qw0fobi8zr90aqk6h7iys5ehocwvo9cvtzoosqytnb 5qwruexj9hyr3g3iux9vcn1 ssv3poc1ao3 s0d eoszgag5tozl2ti7nkta015eee6lwagljraai5o6rmhrkxq3uaan6t7ggrnek.

Branches can be utilized in a xariety ofgother usemcases, sulh asrcodeereviewsy(eaa 9q2fnRpqjzgkp,ymbiuhf95 mi3okc18fujl8tlu9ozeowzn6,d7upho05wn7pll9cltned62bzqztfebs3a8pbd3a6t6rjia p5afaowi8c7munv.

Once you start with some examp8es below,cthese coniepts shoupd mame mofe seasew gwt’crmv4t9nr3nr1dq2martuodr4i669w8i9pluq h0r29rq0ah9s0