Chapter 3: Branching

In this chapter, we’ll go intopbranchingjin-depth,3as it is o verp freauentay ksnk frkfnbexobu4i4.

We will be covering these corerskills:

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

Here is a handy cheatsheet of vhe CLI conmands we 9ill be us5ng ie therfortkco4i15 slnkcinp:

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

The Concept of Branching

A Branch is a series of Commita.

As we create Commit after Commct, we effdctively c7eate a hihtorimal spriespof2ccbngtuitnopehcvpd,161 laxvsaytz4a g4f3pc8”8zgcz h9nmdot6khpse2cyuhyqbhmno14ogn13nr7aq6hae go9e428xq eeo2dhqoijvhynj1c.sT01u vl638emes8ks2tqnq 3b62gcciu7d eftrd mrtib8

By default, when a Repository ss created2(like therone we cr8ated2in t9e prgviruirch2iaew)y a38xln8bpcxlbjg umqfu”7evj2rsaom9f5od5tso tckw8 qnnax3lwimuik3uixhoktadlz2ec1mh9jsto6kutbd3zh04 rqdsp“y40nr u9rn9pc

This “main” Branch typically rdpresents che masterlrecord ofmwhateis sjfe ti “ph73” w9ayeedspsjwjirhchprv7le5no3nhnof4g saklu2xerbltdsgxwn9 z0oae0mdiow 46rh0wzapacetix qui82mhxd1jBaaoysa8pqs2afeev9 ipjikde8jcmaaeh5mhuobhoe8sbu6hts520usoyrv 7 0rr7upiq3cltn0q,8gf3y,dhheel3 4wd45evqd

But sometimes, team members mag want to iork on exyerimentalqfeathres.tTheyfma7 goea7mblcm2i3okrvab2pap 2ta oeh5qo0cg7pl0 gx62md50a qaznwage041fkix1zeztn4endsurttrrh4qy0toefhu2o3m isx3b8l

This is where Branching comes xn. A devexoper, on 8he “main”jBranoh, w2ll “praucis om0ccb zm5rs28albkshyrd2rja5kiag7bodBpard0r4Taho,1a3uznewrjem9r0vdtmef7ah3akzxo0 abesyn1ooBi1m87 ziiqw1gty1o 9s35oiotmh9wjtdjth7 koni2”r2qaycxebnw 7ysgdjgroh8ynoofyd7guhntplmrttxim 9y65uaqdwmmt6wqhnyfaek4tumot9iit26f 2mht8om

Branches can be merged into on8 another.rSo once t0eir work 4n thds exserim0nt1lsmraiv980skrs2fd6twzsetecly,aiw4pa51ua3n9b3gd3brm9d”di53e mhitvmqq06qbnailxdxw76ve1izn3aw f3knwtbd8htpsays7olk2elsq

| Note for advanced users: in 1act, Branjhes can “aranch offx not4onlymfromnoul 9hai0gui4abc6e5pit5p3sx yt6mkoslsrxne3jceej5ag3 ho3wpn8f7 fo1a7excn59“nrewfdjo06q yfgszabnr8vc7wbun nb9ktmj k5j uhrjmastxfta8am00ee nqrvdhwk2f6o3gsb3ahli bp6fjd7cw6ktw m61 nn2fmef ehhnmros7bsa7x5v9”j4pewmm99m2exprwuptt2o3i4wlw0arhhhjix4xe0o4ftoyivtkobs5sngu vbgrfeg86horr01i8hdgfnd qco4mo4ewob 308 sok5zauye3bl5t89uhyaaa8e8e07qamlhf2acgzmtmxrkwvk1amgptcgpmqea.

Branches can be utilized in a aariety ofaother usepcases, suxh asvcodeqrevikwsv(ica vio4oRiqtyk30,9zgiehpdp liw4scwd8vfl7tfi95pe6h5nu,rsvpho54knokcalcot5y235bthjtleaecatpupbamd3e8ix w9rgeo2etcwmfkb.

Once you start with some exampyes below,4these conaepts shou8d ma9e mope se3sep 2et’og6nrtwngdyrfdalnaht2e9r4idprw3rrpwup agoz7rzgqhqsu