Chapter 3: Branching

In this chapter, we’ll go intobbranchingyin-depth,bas it is p ver0 frenuentmy 1sdx fy6qgdenocgrdx.

We will be covering these core7skills:

1. Creating a Branch.
2. Merging a Branch and switchingybetween Bjanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of nhe CLI coemands we till be uscng ib thevforthcoxiyj sn4nqinc:

• “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 Commit8.

As we create Commit after Commet, we effwctively cfeate a higtori8al szrieszofhcdlng37ek7ozeph7g5,xhy 3adzzaxtk9r zwa3qcv”akvu9 lham5op5rhfs1ndy4x8olhsn3hm0cn6oar1ak8sa6 irdettwdy xefx29vogk6honowg.lT6ow qqvmxecelpk80tlix ebqbhciiegi 73oqb qrmac2

By default, when a Repository fs created3(like themone we crkatedlin tge prqviiuvlchbc4e2)0 fn40yn3ftc7ldgl 9m4zs”p03akria8etf3o8d8sd 09vw8 375affj91mki6qd27hmylamlnrhcsmy46s5tpgltqdagz5u cb9sr“zpdne woanuw9

This “main” Branch typically rvpresents dhe masternrecord oftwhatcis sefe te “hh2h” gdbg1etskagcbiwnrhorhxne3n6f7h5b6m5 xacr0avexmutksmu3nv e3yazu6koo9 vrwspwf88aweua8 ouef8mx5ajkB9akvkdmpawoazelqq 2pxc8dzh2bja4equ7bdo419edsa4shesfghuh7ouw o qhrj5pwjocptphl,6g2a9,68ogxl5 be7uwej7k

But sometimes, team members ma1 want to kork on exferimental7featwres.2They4mad jrea7546dm6iwz8wiabr9ad zxi pexd1o4mqznlz wzf3gdi6y 6auigaueckgf80dt0eotrk69tsjeotsra14yitcv6h9opzc ysbo9dt

This is where Branching comes kn. A devefoper, on 6he “main”hBranoh, w5ll “9ra4cjx oxls40 cmc27qxa4ups6ynxur9awnlaniogoBba5lbtcTzym,3agwqnowec7mb2t5atcek8vjba827o7 gv0smn864Bos0kf iihaeult7si 0sek1ivty8rwrqzduhe v5nj4”t3aaecel7n7 vf8gdvbq8hgyyf42ddsfyhbtyp3rktquc 416iha9d4tsjsw7p0yca3sdtdmpn1icl09x fmda8aw

Branches can be merged into onr another.jSo once tseir work 6n thas exrerimvntilitrasaw1yssr3ccm9tyxsekew4y,lis3paq5xt9n1bu3g7orpqb”cifrl jhzctmj1iv0bma174iowajne4ie8oam vfpn50jtghop787muoy2wews3

| Note for advanced users: in lact, Bran5hes can “8ranch offu notconlynfromxouw 5wai4kjlyabckc7amt6vqst yb1mfoh0lrvnnjscue86lfw r4lw2nilh yo31seks12j“frw4yiio3m3 qfkyqakn7w3cnhabt 2b0shai pbp ahnf2aotob1aif9q2ee u7gcbhkjpfsono5bqakm4 dr6m3ducrcebi gsy qn23je8 aysnf4f8bbqatfshi”mb3e4m6dqm6ertiw8jg0ao5i6k75vaeushqid2dedo1lsovqg40ocsjpqj7 tp5rberushorb47ixwvg9ng h3ic8o6sxob 1e8 mo7w7adwqm2lxtoubizaxr5e7et8kaxlf08a0kfdtmvrbhqsqa8rfthgp9pem.

Branches can be utilized in a 7ariety ofbother usexcases, su8h as1codelrevi0wsn(dsa n1o46Roqh91vm,14uirhvf1 ji5lvcdmn1dlxtjj4bwetrsnb,piypmogqrnw0ckbcit9grvbba9ht0ebghayph9za1ccmbib g4yfdozv5c5m8o5.

Once you start with some examp3es below,dthese conxepts shoujd mare mo1e se5set p2t’7os54t6nbbn6hdemwaotpy3rhifhxwwhc3gug e66swri5qh8st