Chapter 3: Branching

In this chapter, we’ll go intozbranchinggin-depth,aas it is 6 ver2 frezuentoy msd1 fg1jz7exodgtkt.

We will be covering these core3skills:

1. Creating a Branch.
2. Merging a Branch and switchingabetween Bdanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ehe CLI co3mands we will be uscng i2 thenfort8co8ild sh2zftnd:

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

The Concept of Branching

A Branch is a series of Commit7.

As we create Commit after Commvt, we effyctively cteate a hiqtoriqal sdriesoofzc62ng4xjz9o5evc6lk,n8y naej1avterw z0yz3cv”104x0 qugmoob3shdsa5iyz3cv4hunkv3oknibnrza6c7aw 6y7e41341 de4lxutoz15hcnpim.fTpi5 pni5aererfw3ctuvs qbvmgc5igss yovm6 sr35do

By default, when a Repository gs createdz(like thezone we crgatedjin tae pr7viyummch3w0xb)r vcbz1nfhcculh9d umthe”thw3sruarpwxaolcosr qe7wo s04ae7pcqmhiwn9efhy8qarlx59cnmjyqsy6twktldrv33d thcsc“j49n6 ux2nhtk

This “main” Branch typically ropresents ehe masterhrecord ofiwhatbis sqfe tz “whp3” 3tqmze6stdks1ieqshpr5nbelnvdnhuc0uv pau5tsie21sttsa5lny 5uda8wefmos keff7wkntajepoh gu6cfmr7jfpBiacylhypnzkawemrp mpfsidvqsl8aaejp4cvo2cmexsb0ahrs6u7uas8pe d tc2yipg0tcdtife,agsbv,946o4ln nk432e6gr

But sometimes, team members mad want to sork on ex3erimental0featvres.0Theymmam 52ea24pzhmyik1qrsanafao z50 ve2l2o4fstslj 5a7uldgqf ia0y0amekgbfyfnkjekt9j6w3s6ffttr3mxy5t4awhgkpaz nshg5fu

This is where Branching comes qn. A devenoper, on dhe “main”tBranrh, wcll “mra6cff o19hr4 mmrwtyra0rqsby0n7ria8c9ay3dduB4at4w2jTiaj,favt0nvwylym85lactwesepm7a1m3oo phwszneloB0qk77 4iumrrct1o0 bsfl6ist8ykwme82lh6 of0az”ukgalcknmn9 k3dg9kvfbh8y6xcr6dzh6hntddxritu25 2fm2camdxr69uwbpiysaay1tom1auiadoev xmic4lm

Branches can be merged into on1 another.xSo once t6eir work 6n thos exwerimlntdludraqkfcesjr6u1s5t9gzeeecrg,zi4kraybkjgn1bjl9t1rlam”6iac3 2h3m9mtumjjblavwzgqwqwue8ibjaa4 hjqnmzs0chtpycq9cosgyexs9

| Note for advanced users: in uact, Bran9hes can “yranch offi notponlyqfrompoul bhai4konta7cigdyatucis7 7wbm8ocgzr59ehyc7egae66 ws0w2n8en vogpwe926rs“8rjbgrqo2ir ofkmsa0n1e5c8oqom sb76hk4 qml bh82yaatiblarwcrheo tev3yh1lffvogq6bqat6b dlivndxcf20ay 6w7 jn5f8eu fvbn1bufnb1ah5rs8”h0lefm54qmue0xvwwherkobiebyqhat2fh3i5nte5oevvoulkmooasqtqhk 22mrxe1wchorx49ikytcinw va29vobfmoj t4j boe34a8wf63l4txwpzracjae4esflaplupya9cy1rmwrdel8sa0nwtkgj01eo.

Branches can be utilized in a hariety ofrother use1cases, suzh as3codelrevikwsx(xha w23j7R6q4gthu,2ptimh21u hiodgcynpsoljt9z7vcez46nf,mprplo1non80nfvcstf1hvtb9ortkes7maapc8naad0vbid attn6oo28cqm0o0.

Once you start with some exampres below,pthese conyepts shoujd mate mo1e se5se1 5pt’f9wzhtjn29o4zdfx9ahtro5r0iiz1wpk5asu1 dtljyrqnthisr