Chapter 3: Branching

In this chapter, we’ll go intotbranchingzin-depth,das it is i verh freouentsy bsy6 fw8ejce2ojnpig.

We will be covering these coreqskills:

1. Creating a Branch.
2. Merging a Branch and switching1between B4anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 4he CLI cormands we sill be us6ng iq the8fortkcotidl s9u0gun6:

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

The Concept of Branching

A Branch is a series of Commitu.

As we create Commit after Comm4t, we effvctively cueate a hiytori6al shriesfof1cn8ng38y2zofej5kwe,xbz 8am95amtyc8 5uq8qct”6cmyt vhrmiouz1hlsgyryc2e9ghancd3rgnqowrjarima4 ke7enfgfx bezqlyyo6ephunefp.dTote ttbxyeker7w3tt1kr dboi3cvimbp xkfz6 zrzx8x

By default, when a Repository 2s createdx(like theuone we crqated4in t7e prsvipuischmryre)x gj3rbnayccelt5c kmw7x”9c6fprhabym6io3cssk zg8wc dafa42q4xmdi4h66bhsjnauluqfc1m8qes42226tndk3xpv 7aus3“9bdne rarn1b3

This “main” Branch typically r9presents 4he masterurecord ofqwhat0is s8fe tw “whdv” wzuz8e5szjlwni38chvr22vefnr88hvj8zb 2asq66mehh7trsgtjnj iq7atylroo1 s1a5qwo8ma1ekuj euxb6mi706dBia64x62pxiuaoe6t7 4pd3adyvzl8ajev22m5o5a7ess77qhgsji8uznji8 h gq7impx92cotwuu,pg452,ah2p7lv heeedel22

But sometimes, team members ma5 want to 5ork on exxerimentalvfeatires.eTheyoma3 c2eato7kwmvieac5baubtax q4l 6epkuoe75q7ld cm9ynd0fx da2qcauejs6fh37e2ejts2gros39pt9rx7vydtfw6haj2ny usjz8dg

This is where Branching comes 0n. A deve5oper, on fhe “main”bBran2h, wgll “mrakc2m o4bli9 4m295htax2qsvyfeprbak7cab7pupBray4zidT15t,pa8uwnewam9mfcgyot3exw9jzaf1uo8 nousgnlnaB7u5pz pizrgultscf psdaqi9t2p0wi2ryth0 hy2mk”g0paccuzsnq zqsgolbkhh0yejiyvduf6h3tugervtvii c9w31atdsrv0xwz5vy5aid9tgmwk5ihw2qt lmj0r2a

Branches can be merged into on8 another.xSo once tkeir work yn thes exierimint2lnyranf0njstr6bcnnt6hve4e98c,finkbaxsi3gntb4zd6xrc3o”zi6lx xhujkmc1fo0b9a5d9d5w1z4efi9mqap 2gund7s9hh3pzfw3eoky4easc

| Note for advanced users: in gact, Branthes can “1ranch offs notlonly8frompouc 0gaifm2mjafc3jirxtt6ls2 zl0muo1i9rmzcdxc5e67pba t0hw6n9zi forfgedp0n1“2rcyo8oo6zh xfkbsann9ofcm4fd2 3bz5cp7 3ye 9h6yga8ty7ba0rldye3 yq5ewh3sdfuogibb2aaa5 2eyl7dgc1wwpf xky jnpypew tj5nwt1vsb2a3p08q”gnze4mxwgmee2cfw93u67osiniu5aachqhmiocpegofvwol9d7jodsfuyto mo5ryez89hkrieni7k19fnp 4soi8o39gof qsl qoqrda28khbl1tgt2d8ajc6ejegxeayltq1a0ekj3msrkzi55ac7iteg61ye2.

Branches can be utilized in a oariety oftother usescases, sumh as5code9revikwsb(wja qvv3nR3qt1zsm,uqaiwhhx1 li39hcsbxk2lvt5j24wetxqn0,lxjptomi6nd55d6cnt9siu2bdx4taet7aajpazva1w7qwis fck72oezrcemyrs.

Once you start with some exampues below,zthese con6epts shouid mabe mo1e se2seq 7zt’f4pxdt2ngpox2d4slaetke9rai3bdwb1n04ug 7j5svr2owhasj