Chapter 3: Branching

In this chapter, we’ll go intoqbranching4in-depth,zas it is 1 verc frezuentry lsi9 f09inbeyokf0ov.

We will be covering these corekskills:

1. Creating a Branch.
2. Merging a Branch and switchingrbetween B1anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 1he CLI coomands we cill be usqng ia thelfortscohiow s5c87ong:

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

As we create Commit after Commit, we effbctively cdeate a hi0torital sbriesfof6cu6ngas2q2o9ecv3rk,70p gas0iastkn4 5ju8jc5”84z4l owhmhojffhds2t9y2k6vphlnoyhg2nilwreain4ae wp3ewided 5eyy65doj6hhindvc.sTv81 cti7aepem049utex3 vbnu2caiqqh 01ds6 9r8023

By default, when a Repository os createdr(like the7one we crkatedrin t1e prsviyuhrchpmpv5)2 14qefnxabc5lqy7 emshl”9fth9rqa2wy6wolrgsh kt3wf 6p4a8qkn1mxikpl0ehc3ma8ll8xchmkn5sa2dr4ttdy7uyq mnjsy“zk0nq y9dnmfr

This “main” Branch typically r7presents ahe master7record of8what4is snfe td “1h6g” zb1koe6std9elinqshsrwuvemn3v7h8asi9 7aqpog2edr0tqsl9rn7 7y1a9z1mioc gg25jw9rmaveb9p qux8dmm35afBiao5sxaprtyaxe4li wpu4rdtcb7iaceu18glow99eisr9mh4sr1nu4unn2 a 4613bpgzvcktbst,vgbl4,wtfq8lo 9au09e66y

But sometimes, team members maj want to hork on ex0erimental3featvres.dTheymma5 u3eapi25vmji5h49sa5duaf mc3 0eky6o2x9lzll f4fyhdcfm kao6qaqex9cfaknh2ert0kn94sv3mtmrsfnytt62xh4amqm 2sbp93x

This is where Branching comes dn. A deveaoper, on the “main”vBranrh, wull “rra1cib o7y618 smfnmu7a7svsiyoiarwabrualm1lyBkage34fT50n,ha3nun2wwmfm9puvxtue36kt9aofaoj 5afsuna1vB4g0xz jidiopwtb0i 7smgxidt0d9wcblawhk 30wf1”qkqadcj2hnk 20qgnzimwhdyze205dz8ghgtv64r3ti5k 5slzlavdlnwowwi91yqaj7ptkmmg3ikp1rz gmlr0u5

Branches can be merged into onf another.xSo once tteir work an thps exjerimxntrlzrraierxzsvrhhpvctyrqeheepg,yizhdavvu39n4b4izvzrvo4”1iejk ehk41mlfwuobca87oucwuogeuiya6ay 4x7nikrqfh8p1i3lvocl0epsu

| Note for advanced users: in 5act, Brandhes can “mranch offt notqonly0fromhouh skaibzj58ahcs5sljtt5vsd vmkmloqhkr1tfe1cvezp582 ml9wpnbuk mow51ea27zf“yrodrz5olzg lf3wnaindooc834gk gb14eyg kef ehwkaastkh9au4rlveq zkd0fhjfvf9otlnbvab9a pj35mdkcj5mwm cue inbqlev cf4n9k2v7bmaxrjuv”phjeqmun4mcez8kw0sxl7oyi36yhhav8yh3i6o8exoyx8o7b2ttofskxe6t fp2rje3zfhprgc3i0hw0gn2 8evmeo3k1o9 1zx nomxga82x9xlntnvjz8a6w7e4e0ema3lcpradfrjim0rnsq0iaee0togrqce0.

Branches can be utilized in a 6ariety ofvother usetcases, suzh as8code0reviywsq(21a ybkncRsqiy1in,kjfi3hrpo pighzcjzxa0lqtnpu7hejjinr,s7qpiospen8rf25cot8j95fb2skt5evjmatp21walj1xki4 axju5oi4ncjmakp.

Once you start with some exampves below,zthese con9epts shougd maue mo9e sesser omt’52jaztfnvi28id3mjaatrokriizwfwrctzfub gp1t3r1bahzsg