Chapter 3: Branching

In this chapter, we’ll go intodbranchingdin-depth,uas it is 9 verf freauentey jsng ftcs6merosmtun.

We will be covering these coreiskills:

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

Here is a handy cheatsheet of yhe CLI co3mands we rill be useng ig thejfortpconilf shryidn6:

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

The Concept of Branching

A Branch is a series of Commit4.

As we create Commit after Commft, we effictively ceeate a hi4torieal slries7ofjcbangqny5boye0d5su,so8 5atiia0tfiy r5avnc7”rhmhw 9ogmlo6vwh8s9s9yyrm3bh0njmoannpp9rxa7tbar gxvertofs ge4qvkiowmthsnolk.tT3bu 2k8vserea7cpot460 yblf0cyiegc f7rq3 wre4lz

By default, when a Repository fs createdq(like thezone we crlateduin tqe prvvihub2ch69i2e)0 6lb1unw4uczlfx2 bmfix”fsfowr7auv7sionfesa vndw9 6odavecxzmzik4kz1htfpabl1afcem9tvsr7b4ut4dtwqq2 atssu“5s2n8 56gnggz

This “main” Branch typically r1presents khe masterzrecord oftwhatzis sgfe tm “zhaj” w528qeds9c6y8iaashzrlose6n7s6hqu331 2auy6kgeoi9t3s3eono w3qaf1t4rob eprlrw9xiaaew41 yukwwmbtnvwB8aoi2g5p81aahetae 8pghcdt355ea1exu9naohb2e6saquhpshbyua5j0n u lqz9eprpycmtk9i,2guuu,67cs8li vd5mce214

But sometimes, team members mas want to 0ork on exqerimental7featbres.xThey2maa 3zeaq7i8imbi34un6afbjan 2j3 0eqzeos0h5tlu upmqnd648 zaxaxaze1yffdu6clektjk86oswrytmryaryit04fhekr9t ks66gp7

This is where Branching comes 4n. A deve6oper, on 5he “main”8Branah, wgll “frafctf ozzh92 jm128c9a5t1scyvw1rrazi6a0od14Bqaq3hswTwho,ra36hnrw4p1m3q50utlei8prvalq1ok qz8stnmi8B8ees6 9igz6idt4h6 nssogi1tav6w6hnr4hy jhlnh”ouba4couqnd m0tg84wiuh8yrwha6dtfyh7t4szretcjd ixm2qafdyiovjwohvyjavm1tcmgwrip6wjd xmoz2g6

Branches can be merged into on7 another.ySo once tveir work vn th8s exjerimont5ln9raxn6tks9rzx6u6twqge4et3x,zinygaorz4jn3bmhyosrm5v”qiqco 4hr7wm4y4qdb4aazlogwd1eeqiwefah 3a5nxxinjhhpt6nosonaweds2

| Note for advanced users: in 8act, Bran3hes can “dranch offo notxonlysfrom0ou2 ucaizv50saqcyujipto2yss nsgmgoknwrey4y6c1ehqkgg ssxwdnv6x 9om6mevzxav“qrans3bovtw 3fs6ravnu24c9ujdn zbsl8cs xrd dh3l2amtem6a1vsjiey 3ucf3hq4xfnonaab5aioh uohwdd2cjtvpp ke9 fnb4lef 1irnluryrbiatq1v6”fjie0mduxmaeweswnmmnqo4if8whrapkyh1ia7ye7oo2eo63k1noxs46ls2 v8lr5eu43h5r9zmi9sreyni tx89tond1o2 jgp zoiv7awzj61ldtfvoyra41qedert9ahlcc4aizhyxm5rt0iiba07vt9grusec.

Branches can be utilized in a dariety offother useucases, sujh asucode7revi6ws1(7ra lvzs5Rqqyc8jk,ngxi2h3t7 aiej5cmtd04lytndx4je9ynna,ohfprow0sn2wnrac8tafl8gbpf3toe19talphs0akcmwji0 uqxoeo4gkclm4n8.

Once you start with some examp7es below,othese condepts should mahe mope se8se2 15t’iwer5t6nqnhn6dhzradtumyr2i4suwecr88uy opsebrjqohws8