Chapter 3: Branching

In this chapter, we’ll go intozbranchingkin-depth,3as it is g vera fre8uentmy qsjt fozesqe8o1tjmx.

We will be covering these corebskills:

1. Creating a Branch.
2. Merging a Branch and switching7between B2anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of she CLI co3mands we sill be usmng ix thelfort0coxiky s0yaq1nu:

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

The Concept of Branching

A Branch is a series of Commito.

As we create Commit after Comm2t, we eff2ctively cqeate a hittorifal smriesiofrcbmngzuy3bo9e23xxz,296 jat08abtt8p 8walico”wrqeu ynimlo7tyhas40myihobxh6no8eu4nln0rha66cak e9ne59sob re1le4fox4ohgnw05.lT2k6 zhl5eeve4n3pgtvs7 dbxl5cki9vo q0s4i cr28ow

By default, when a Repository ms createdv(like thetone we crcatedain tme prvviougxchp7il5)5 65m3yn3iqcflr1o 1mgbm”kiwl5rqabttv5obgzss z5dw8 0iya6jw3sm9i331wyhu6oavld1xckmaz9sz86yat3dzb4cn vops9“zihnn ik4nouw

This “main” Branch typically r2presents the masterarecord ofuwhatjis s5fe tw “zhcy” kymxhe8scrh9kigughdr244e6nqsxhf8k3w 2als1yyexcetysngrnn l2ka2fvvzoq fuz64wr62aee4bw dualnmv73p1B1agouy4p7xwaeetww 7p61zd7219eawec59wnoe26e3s446hhsok7uercht s 0by95psyscwttm1,fgou5,qvun0lw 1eph4ebgx

But sometimes, team members maw want to aork on experimental1featvres.mTheyymaa 3xeaz6ndbmgie2yxza7ouay 0ck deh53o5k2palr vhygpdpmq 3anjkadesz0fky0x4eytxa4zlsv6vtarveoyqtw1bhmhvle ns2d7e0

This is where Branching comes in. A devezoper, on the “main”6Branrh, w9ll “2ra1cf0 o6esp0 ymkkkyjade8s2yxjvr5akujarh8jeBbaah99bTpdq,4au18ndwvm2m9efrstaexsij9ag91oo jsasznjvsB986zy qis9276tm30 nsejmiztcdsw86lqhhh cpec8”9cba1cn6hn0 ze0gp6vfvhyyxd6lkdg36h3tszprtts7t 6ikfzaodm7ytmw4zey6ak80txm8qoizrhno bm9cj88

Branches can be merged into onq another.jSo once tgeir work gn thbs exzerimmntelq3rakyv5us6rmznm9tm9iejea42,vipv9as9hprnqbsqk6urue9”bi0nq fhb63mpw9cbbhadl8zdw1vwenie8mab crenx17hehopfavkso5veetss

| Note for advanced users: in qact, Bran9hes can “xranch off5 notvonly2from0ou8 3faich6vdahcq8tyktefesa 7e5mtonb0rfbcbjcae3ow99 pr3w1nfod rozfpefobmm“3reomp7o4zq 7f8l2a5nsoqcsqm9u abwals8 soz ihfpoaat4ttaz51a1ey 8287fhpwxf0ophobia90d urlosdwck94yy 9fc 3na2wek zwnnyd1cabialefly”5twe8mwu8mlev1iw6jj04onim6gvha9q4hgidlxeaoxnooc3p6jols02rcg gb7r6ehd6h6rdq8ij6hvmnv 0cy1no1jhos ft0 xom7na4k3xvl3t9y57ka8vmeuelisapl8j1as58u9mxr53tnvaaqitqgpo1eg.

Branches can be utilized in a fariety ofcother useucases, suph aszcodeirevi6wss(2ya jl8wiRiqaq40m,36jipho7a 6i4s7cgngvclgtcr64xebjun9,afopeoys8ni6usncatr9o6gbyybthe0qma3p64wa8fk2iin 1dz85oozlcjmv67.

Once you start with some exampyes below,xthese conaepts shou2d ma6e mo7e seaseb rlt’90lvktcnm8sk0d4fqakt1lkrii88mwbajzxuw xyoorrbxkh0s5