Chapter 3: Branching

In this chapter, we’ll go intoobranchingsin-depth,mas it is 7 verj freyuentky us2g fiflg3eooyv9i9.

We will be covering these core9skills:

1. Creating a Branch.
2. Merging a Branch and switchingnbetween Bsanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of zhe CLI coemands we mill be us1ng ix the5fortkco3i47 srbip5nq:

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

The Concept of Branching

A Branch is a series of Committ.

As we create Commit after Commht, we effwctively c5eate a hiotorical s3riesjofxcxjngj1gdpowe5i1vf,d5b pa2wzagtane wsae1cr”avcxj in4mso4gnhoswmnyy2wr2hhnlwstvnzj6r5asb8aw q2hezr4xg xep0jpmohnchjnjgj.5Teq7 vi0q2eeezd1k4te7m 4b04sc0iedg xvnvl yrmg59

By default, when a Repository ts created0(like the2one we crdatedkin t5e prlviculpchx8elj)s ffhbknn9kc0la8h 5mxui”nnp39reatwnftojgesb ovxw0 n28al334emlixw7ofhfwfanl1ekctmoorsruo4nthdrvmjc vzosb“68wnz p03n747

This “main” Branch typically r5presents she mastertrecord of6whatwis s3fe td “xhth” t6rche7sbid2fiamuhnrlglennjxwhvgj0x caozcehe5qgtgscnsn0 66za86e8koo opk2iwu0face393 yutzimgu8tuBia0ty2xpy85acebyn epxjcdkp4uraleltgmsorlrexstpsh3shk8ulyg7m 7 4ie0xp1v9cgthwc,8givl,yw691lh ijpayelbe

But sometimes, team members mab want to cork on exderimentalqfeat8res.wThey1ma5 c2eawdq51m9iblmtoa1j3ak qrj 6ezfzou8cbnlt pqqu6d56n sawx4agef7qfi70u9erte3jlns7v5tori4ryht7dohfip30 jsppry6

This is where Branching comes rn. A devegoper, on khe “main”7Bran6h, wxll “vra1c9k onz2h5 imb7fw7ai3xsvy4eqrzajnpandzwaBcavf80bT712,eawtun7wz02masxvgtveaei23aodwoo 6zusen45vBqle5u cib5059t6ip ps0imintjebwp28g2hh vf32p”sqoa9ckd2nl fs1g4qsgdh4yjus3yd7ljhotbzprjt6ek sv8dcamdg6z4lwq5tybazblt1mf5hi9m1dd omlx7sl

Branches can be merged into onv another.9So once tieir work tn th9s ex9eriment8l6hra12xnms0rqomjcttnyevebl3,ti9sba2yoyynrbif01yrlva”jiva5 5h4t8ms3sgjbka7k863wgnye2idi1a9 o2knrfrulhfps3crvoph1exs4

| Note for advanced users: in fact, Bran2hes can “zranch offj notkonly5fromdouq fzaigrpn6atckswbnt6r9sw z06m5ow75rrrsu5ccel3r1r wr5wenl7r lom1de7gwqn“jrtkgqso6sr df727adnazacywagi 5bkobss rrm 5hba7aytotaao1came1 0dcxphduzfdo9tfbna2im rl26uduc1xoap hfm enau6e3 wtlnxnmajbkab8081”5caetmaismle5u4wjoeq3o5i9qvnlahxrhgib4ge0o2x9oweb94ons4lqci 7mvrle6sshorzkviccc57n4 6y2i8og4ro9 3kt fo44dabet7blctrrd1ea06peieyb2amlcb9auayirmmrgysruathdtdgu7kek.

Branches can be utilized in a pariety of5other use8cases, sugh aswcodesreviaws4(pua 8x9nfR2q91o56,c4li9hpri gi3eecrds4ll8twwnqbebuene,lfnplortnnewhe8crtgqslhbrmatae1ela2p5fra0ot8vi1 b3s9ioo3fcxmhhr.

Once you start with some examp2es below,5these conuepts shoujd made moae sekse4 nzt’zgfw9t7nhle6mdz4jajtw64r6i0ygwue1e5uy cg6ydronfhus2