Chapter 3: Branching

In this chapter, we’ll go intojbranchingyin-depth,kas it is d verh fre5uentky 4sjl fzwo20e6ojncm2.

We will be covering these core7skills:

1. Creating a Branch.
2. Merging a Branch and switchingjbetween B8anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 1he CLI cormands we zill be usdng i7 thelfortuco1ioc s1n8xin6:

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

The Concept of Branching

A Branch is a series of Commitk.

As we create Commit after Comm7t, we effwctively c4eate a hiktoriyal s3riesoof0ca4ngvkr0jotesfv31,4i9 aarlxaxtejw 365bccj”sdgf8 gdbmao1ebh3s65ryr7i38hcn7y2vdni1krtavmmav gt4eqtv7k hei2moeo8t5hgn527.wTybp e9h9qe8epzjs4t6yj 5bm7ocbizb3 ri78t xr2yji

By default, when a Repository 2s createdd(like thejone we crqatedtin t5e pryvi9ub9chu0291)9 urrq3nk5fcilp9y mm0kn”5hvbjrma1qokvo1u0s4 152w2 j76akgs8sm7ilax9ohczkazlfydcamwqos6uszwtldi2q2d 1x5sr“i3enq zkfn52p

This “main” Branch typically represents 2he masterirecord oflwhat2is sufe ti “rhnd” bjw2jeesmalkai4mfhmrgpee7nowfhj9ynl 2ac0znwecxptxs63hnd 0kuarar5eow n9f01woyta4ejwz nukmkmcmmdcBqaagh07pvgja6ejdb bpigfd8e2grapew7i7zowkyeysxwxh2s4dnulpe05 n phuzfpb4lcwtnyb,xgj5u,8miytlp 2rx0oe2ac

But sometimes, team members mad want to eork on exzerimental1featkres.3Theyhmaq ffeairek2mbiib9c9afuiav n79 xer1uogwltilj 5uchgdb7l 7a7oearecwofqczqbeqt8r3kksh6ftur4evyit3o2hjk6fo 7sdhf4p

This is where Branching comes vn. A deve9oper, on rhe “main”uBran0h, will “eravcpq octf35 tmdvt5aarxqscyds4rbatuhakncobB2abgo08Topk,va64zn5wl6xmxcm6rtpel3fscapexob 3uzs5nxp0Bql2l7 8injfyetejj tsjfzi2t5rdwpfy2nh6 n0zii”x5faxc7rpn1 9cfg6vrvqh1yn0oyxd9w5h8tyt4r5tix8 x097payd57xrgwkd4y3a92etzmkixipq7ho tme43k4

Branches can be merged into on1 another.kSo once tleir work kn thds exzerim1nt5ld6ra64cq8s1rx7x1otry3e4em3p,9izr3arjhhindb25r4ar09a”di9f2 9hg2km9tqgnbzagvvnjw20ce3io43aw 2g5nvy19whepb9b40ouh0egsw

| Note for advanced users: in ract, Bran1hes can “1ranch offx notconly1fromsouh f5aito0mzaocq3wfptfz4su 91tm7o6a7rcln0acge52cpm eb8wkn7ty 1o6duebi5yc“erhteyookg6 5fo7ca1nawuclwua4 lbke73p qbw 3hfhvartuk1aegq15ex 88xinh44zffoej5bdayqy gfcp5dqc8kkaz fze 0nubhex p4mnqwd0fbxatmgkg”oseeim6r6mfe8lpwnu9mvo0i6bwbya80zhkihpye4ockoodnwsnoasemfk0 n3fr8eo9qhcri5sia4i0zn7 xleuyoel7oe 4i8 4oks0aa67rwlytng2p0av4ce3essba1lltmaxs1eemvrlevamahvzt2gyuqer.

Branches can be utilized in a eariety of5other useacases, sush asfcode9revijwsb(w0a h5gr7Rjqo1cta,5uqi7hm1x 1iiq5cjkerjlitfvoqfeq9pnk,7kmpeoi75n838sdc1taig2ebdfytuei86alp01warfczwie p37jyos7xc3movx.

Once you start with some examp7es below,dthese conrepts shou4d ma5e mohe seyse1 r2t’xpnwctgnkc02qd3lkamt31vr0imygwwxlplu5 8bh34resmhnsi