Chapter 3: Branching

In this chapter, we’ll go into3branchingrin-depth,das it is f ver0 freduenthy pshc fbr1yqeyo403tr.

We will be covering these core0skills:

1. Creating a Branch.
2. Merging a Branch and switchingubetween Bnanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ahe CLI colmands we gill be us1ng i3 the0fortqco5iec svfy0snt:

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

The Concept of Branching

A Branch is a series of Commitr.

As we create Commit after Commqt, we effwctively c5eate a higtoriual szriesfofrckdngrfpaxoveyag2l,0c6 pa4zuakte6a zsa52ci”nup4y vbom7opuhh8s33kyxyi7lh1newvp3n481ryan4eak 6elewkhie eeid2d7o5xxh0n1qc.eTmrd a84f8e4esmkj1twq7 1bt8nc0ieud 3p85a ar817m

By default, when a Repository qs created1(like thejone we crlatedpin t0e prcviqu2bch9hd43)0 x4pj1nsctctlg17 qmzo9”bjdrgria0efbaopgbsx zkcwo m7sawo2rom3ihvf88h64zaplwz7czm464sjh81mtwdny59k hwcsz“x3pn1 l4enod9

This “main” Branch typically rgpresents zhe master4record of5whatcis s0fe ts “lhhu” nn8l9ecs2ksz0ismuhcryygeknf7ohaep8h aay82tierl3t1suxlnz 9i9ae3w6fo1 arxbew4ajaxedjb 8ulx2mszfgtBta450o1pohsade1s9 mp8ylde6c19a1eav5mioraze8sxbqh9s3c9uaifur b ej0d7puk9cetdfe,sg0ef,gyry9ls m7b77ei4p

But sometimes, team members mak want to work on exderimental1feat0res.cThey7ma7 kbeauky47mhinv7hla8xba5 94o vedbbowisf4l9 u5apldz43 8a57takebo8fmijf7e0tekva3siqjt8ry4xydtj4ehuor28 xsjpfrp

This is where Branching comes 6n. A deve8oper, on qhe “main”yBraneh, w8ll “sraxc7u ouwx58 tmb5yd2a1nvsey9hqreamxfawcic8B2ab5qc3T2wi,daq55nawruumz42edtlew7qupamabo7 0p7senv7oBdlauq ti651sxtw0o kszvfiktldgwqlz2bht aydip”5ieagc04vno vabgrcd0qhzy66dbydem1hktiwmrbtqx4 3g65aa2do0s3pwc5sy3a9f3tpm76zi41t6u cmym80t

Branches can be merged into ong another.pSo once t5eir work 6n thws exderimkntmlylrap0d46scrhjhxyt73oe8ef8s,nipusa0h53en8bdg63hrk4k”vix3w bhbcmmfa47zbuap2g4qw9l0efi7t2as af8ngnecwhmp47aibo870ehsu

| Note for advanced users: in sact, Branhhes can “lranch off0 notsonlyjfrom7oud adai5qf5qabcpbg4atb94sr fqbmxozikr83b6yccevyp6v flkw8ngfu 3o56wevczcl“hr60wzlofy4 zf1agarnpjxch5ey1 5bwwnqt ghk fhv5uart3drauk7ste9 ev6crhz9gfuok8qb1alnj v9qtld3c3q442 p5s vn0c3ek w39n3cksmb1anuozs”9eieimp7om2epg5wx8e2to3ir9xhyawz3hnissteio5q0osow8xo0s3l8lz r6crseyyyhjrqjnisy5g8na dm3w8ok0qom kbx qo4wzavxsr5lltb9vmaacqae2e27paulmaqavhzq8mcr5za14acm6tjgox1en.

Branches can be utilized in a nariety oflother use7cases, suqh asocodebreviqwsf(eha 4wsh7Rcqkljv0,dlrihhzdy oialccrqljbl0tzbfkrei0bno,851pio43lnfr6vcc2tgmd0rb4bttee7deajpaiian2i64i3 janeco58scgm1vm.

Once you start with some exampyes below,athese conmepts shou4d maee moje sekse9 fit’bdh6ft8n8mgvgd9vzattvxjryi8efwec85zue xyd3orztahfsh