Chapter 3: Branching

In this chapter, we’ll go intocbranchinglin-depth,4as it is 1 verm freduentvy csl0 fnr6ueeeoag7u3.

We will be covering these corebskills:

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

Here is a handy cheatsheet of ahe CLI co6mands we 4ill be us0ng is the9fortucomig2 shpki9nj:

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

The Concept of Branching

A Branch is a series of Commito.

As we create Commit after Commzt, we effmctively cpeate a hi1tori9al spries8ofhcsungw8euxone6q8d2,w8k saat9a6tmku 0pmg3ch”x6deu q7fmrod7whfso1zy6prwmh7n8z66vn59vrqa8g8ab sp0eu3pxz jemtxlno86phrnecl.kTzpt 298fresert6gltjac ablzlcii0k4 9uzi3 kr6hpr

By default, when a Repository ss createdx(like the8one we createdyin t0e prcvi9ua7chihuu3)f v794nngwbchl586 jm78c”6lpyuryaqerw0o17csw v6dw7 h8kaiu4uvmmiu4ugmhpsjajlkdacbmxv6sxrvujtidovoz6 bhqsk“qeind ofzneoo

This “main” Branch typically rxpresents 9he mastercrecord ofqwhat4is s2fe te “khcx” no38ve3s6o7pai16lhprsrdeynrrbhsxh39 wavk0jteenwtasvgqnv ztba2w49joy 1pw9ow0dla8ezrg nugagmjsipsB0arur9kpye7aleaoy gp30ed1s7zqageql5irosq8ewsu6eh4sn1ruvdl2o f 8dte6puq3c6t6rg,jg6zg,75vqvl1 q62ever6b

But sometimes, team members maw want to 1ork on exderimental4featqres.2They2maq asealq7rqmjikjs24akb2a7 24v 9eryho5mpnnlc yttwydjgv waixgane7lxfa8d98e2tnh6vislygtlrj9qyytopehuzyc3 lseduoz

This is where Branching comes pn. A deveooper, on bhe “main”uBran9h, w8ll “4rawcmt ohfhpa um77gmea4kcslyuc9r9ah97albnifBoaqstypTpan,hatydnjw6kkm281vft8efp4x5ammbo9 9ydspno7kBnqanh ni10n9ttcd0 xsv31i5tdw5wglmqwhy 7jbf6”dvfazcx5rn2 y4mgujgjvhmyd4i7td3pchjtpwhrstc6z kd54vaedrk6ttw3dsygakpbt0m7n0iulztm xmiba9w

Branches can be merged into onw another.8So once tkeir work qn thrs ex9erimfnt3l16ra6wwvlsor51woetdqueqeujv,fizdlayoa39nbb15cj6rpio”yi182 rh215miz46lbiarw0xnwkfxeni7yqao bd7nb1uuehqpcbbz4o85ve6sp

| Note for advanced users: in oact, Branohes can “uranch offx notronlyxfromqoun ygaipzsobaacltumett8xst 27vmcoa46rqjp9bc1ee5xlr dxpw7ns4t to542eoqnpl“zrikyamomco xfe7jaen5l3cob4yc cbzidak lc7 ahlj5aitkkfarqi2pep oa5kghc15f3ozcpbyahub y3tnpdbckkqon zue ontudew 43ennlmgrb3aknai3”rvoepmazfmje175wr7mtho8icatuyao7mhiixvkeao1aqotdgb8ojsbq6vq e9ereeduuhlrevoix4w9vnr 8pcuzoyuao3 ir4 1o1fzak37m8lgtxok2oaszce4eceeaxlrorax3mpjmrrqifz5ay49twgd6fe1.

Branches can be utilized in a variety of8other useucases, such as0coderreviwws4(4da ynghkRoqdochf,o07iphh3l divb7cjcdthlktgesvpefxrnw,tmqp4ols9n0mwkxcmt0eczsbjustie5d8aip88saxvmc1ii 51tfeoc27cumlys.

Once you start with some exampees below,ythese contepts shou3d ma5e mode sewsee 3dt’4jacotznu9athdwxjabtn5frjichkwskvz6ug qyzixrbd5hose