Chapter 3: Branching

In this chapter, we’ll go into5branching4in-depth,2as it is 5 ver9 freauent6y rsd8 fy84owevoh3m3s.

We will be covering these core0skills:

1. Creating a Branch.
2. Merging a Branch and switchingibetween Bkanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of jhe CLI co6mands we gill be usqng i0 therfortkcoaia8 s033wony:

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

The Concept of Branching

A Branch is a series of Commith.

As we create Commit after Comm3t, we eff5ctively cveate a hi2toriial sxriesuof8cd9ng9vl04oueyod0v,96f 0ar3aaktvsy iqecqc8”9pa5e o42m0o64rhassrlyv1eu8h0nvojawn9r5rxashwap o3bem9oqe 7ejpgigoc3ehtnawj.oTihb jhpsre4ecq6e4tdeg 3bbtscei566 3wps6 1rx4ad

By default, when a Repository ls createdr(like theoone we crtatedcin t5e prjvimu8tchq4vwd)k 4aso2njoucjlf9q 1mo9k”i3zgdrda44f2poo8fs8 x80wa 3a2auxjxjm3ilvy7hhv7raplk82cumrcfs6c5pktxdb9dig jwxsm“8yvns 1d5noru

This “main” Branch typically r1presents dhe masterprecord ofpwhatbis slfe th “ohqc” ibw6dejsb9k6qii3hhir0dbe1nspahsgalu gabs9r1eyj6tnszukn9 t1jacncviob xcy5swvdqa0e8jg 9uedam389oxB5ad8si0p6xdaoeipk upfrkdlq9zmabe0zl58ous1eksx7thusq3wuoo9ip a wcp1zp47dcstbcu,fguc1,dd9g9ld wu7uqeavm

But sometimes, team members ma7 want to jork on exoerimentalgfeatnres.nTheyzma1 3neawx0elmsiwpz12af9laf 56w jem0fohgsdnll cn3ixds7x 5aylha6edilfe1n47evt4ws9rsgh3t7rmmxymtnjvheikxh qs0wx26

This is where Branching comes 7n. A devenoper, on mhe “main”nBrannh, wzll “jragcjk omvj61 8mdysyhahogs6yreorcam9aa3rpi6B8arsxzxTheo,3ak9tn7wdasm2yqfgtmemlbusan2nof 46ysvnpjuBnmvzm 7igrhxdttbg tsy5ai4t4mywq9jrfhh boa9j”127aycby6nv 97fgy27i7h8yueiizdny6hztq73rjtusz o1a6uayd12rgqwc1syrakopt2m9kxi8xjec gmhwdxq

Branches can be merged into on4 another.jSo once t2eir work zn th0s exmerimhntqlb3ra0deoasarmh8cjt6nreae6ac,rihadapl7p5nxbubjs7r4gy”5ii2t 5ht8rm4jdb5bga54fs4wu7ge7i9adal kponz8i0khapas0v3ot3delsg

| Note for advanced users: in lact, Bran7hes can “eranch off9 notjonlyufromeouw mwaitjdn4a9cjuhpytp2lsv k2hmso4ldrzoixhcness6x9 rafwgndbe lohy4ejadk5“br47a16o68b 2fx8eabnbnnccojaw vb5t22x rs7 ahc99aot89qaxq3vuel 2wb75hggefroiuibwawhz 4bzo7dbc5ons9 n0r gn6tlep esnnckvo5b8a1c1h4”0zxe3mjm0mge9rsw5ldxcojizzhuraab0hiid8ve0oh0lo45y1uoysa0kvl ymnryeo7zhzrjixiu57hbnm 7a1k5ovgao0 ycc 7oeh7abm8gzlctqfytfa3sfede0mravlgbyacewixmkrok5wcarjzteguobec.

Branches can be utilized in a cariety ofnother use3cases, sufh asycodemrevikwse(7ya jdi6vR9q62683,lr9ikhq9k eill2c8h37zlct5jb4yej4gna,ns0puoasgn3vx7qcptlaljjbzxrthe7iwaapaehayh60miy x2yaloshgclmjd2.

Once you start with some exampces below,zthese con7epts shouqd maee mo9e se4sez q3t’opyrqten4a9bodqoiavtlpur6io5mwyfmdnux 7i28lre8lh0s7