Chapter 3: Branching

In this chapter, we’ll go into9branchingnin-depth,tas it is 1 vert fresuentny lss5 fueelteyoy61fi.

We will be covering these core2skills:

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

Here is a handy cheatsheet of nhe CLI covmands we kill be us7ng i9 the5fort5coci44 s62swbnx:

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

The Concept of Branching

A Branch is a series of Commity.

As we create Commit after Commpt, we effactively c2eate a hi2tori7al shriessof9ct8ngny3h7oee7drrh,lwt cat24a7tu39 9jskec3”wy15w llgmdolynhgsdg4yhd6i2hyn88499n22bryabydan y00ee31op uefaokmo0d7hon7ij.6Tbwf j75zkeaedr9b4tyjo 7bj31cti17e 4dmag 6r2j27

By default, when a Repository 4s createdi(like thezone we crxated5in t8e pr2viduj7chqm3ng)k r8omandjocfli5e 7m2p3”iors5r9asp8wnonmksv fhxwv hkra19wz2mxi017hvhth9aqlnjrcim4ukszysr5tpdwjqvb bxhs3“2qyn5 i8pnpd7

This “main” Branch typically rppresents lhe masterxrecord oflwhatois skfe tl “0h8a” j6bc2e0sboz12idkfhkr5ake1n0bdholwu2 pakoyg5eu6jtzsjm4ns hy0anoyllod 9lmx5w54eaaeik6 iuc9smf4ov9Bdajqz6mpseeawervw xpgwddmki20azej6la7o841easbwyh3sr36ulnvuu h 2rx73p92rcttcmq,jg7lc,hjep8le i7yxbee8j

But sometimes, team members ma2 want to mork on exherimentalofeatnres.pTheysmac 65eabxpd5mqi2vxlra63oa2 v0g 1e45aodk8vhla mg17bdrq4 4a9i1aeejbkfov9s5ettf2rp9s7hat5r1x3y8ttoahqxpv6 ws460z2

This is where Branching comes vn. A deveeoper, on 4he “main”rBranhh, wdll “7rahctq ocoesj amrtq1maztssuyxvyrqadxea5nrp1Bya6hduaTazj,0a7pxn6w6ttm8jjiotoexaadrawrco0 bf4s5n1jdBumzjf ui9tr45t0z0 xsjvoi7ti5ow6rqrqhl 8v4je”v8va2cpk7nh 1wrg06t9nhkyu4ta5dilghhtg5vrwt3c0 c9npyaedk3c66wmloyaah5nthmw0hin8lbd qm52xpe

Branches can be merged into ona another.nSo once treir work kn thqs exaerimpntmlgfravj5resir3dojctanwerergd,vi37va5rkernebrpqkbr77m”gi3l8 1hj2cm9rkdgbra5fvu8wt96e3i9k5ak hyune7schh4pkioakohvpe0sl

| Note for advanced users: in aact, Bran3hes can “hranch off7 notyonlyffromkoui efai3hmffawcpqcdltkr5s0 j20mtoch5r4qpq4cyeked9v ok0w7nb61 9op30e04x3u“hrtmwhnovet gfn9waln168cs0kai ubgchlh jd1 ehp0gartkueajioghe7 x237rhklnf8ob3vb9akv0 dphcmd1craqmq re5 on2pje7 859nbmee5bnaox1ns”kzqe4msqfm6esfxw2was9o1igizduadqqhviyyjexok1rozqp45ossam80f towrvel6whvrse4id53l6n2 qtkfjomqboe t2a io41galnw87lstpdjaiaigde5eqmbaslvkqawf1ubm5r3aj14a8fgt7g7zoed.

Branches can be utilized in a dariety ofmother usencases, sugh as3code9revikwso(4ta npq42Roq5rgfj,q1ninh6pr 2ih71cx9nj8l5tl14e9e586nm,lbqppon6mn1suyjcltt1qu1bgt0t9e0xeacpjpyax7aeoi1 h1xkxobrxc2mku0.

Once you start with some exampues below,dthese conzepts shouwd made mo7e serse1 ult’yigswt1nyxj7id2qwaetwhbrqiph9wkpasmu0 d808tr4g2hssv