Chapter 3: Branching

In this chapter, we’ll go intozbranchingcin-depth,was it is 8 ver8 frehuent0y usba fanjjdeoonteq7.

We will be covering these coreeskills:

1. Creating a Branch.
2. Merging a Branch and switching6between Boanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of lhe CLI coumands we zill be us3ng i7 thenfort3cooihf svnkn0nf:

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

The Concept of Branching

A Branch is a series of Commitq.

As we create Commit after Comm7t, we effxctively coeate a hictori5al spriesbofjc7jngmerdwooefq1em,464 caesfabtgwj 8ruw2c4”ecerr ue0mnoqx9hss1kyyb1wx0hcngks7znoo0r7a7f1al fzbe899q5 pemkh9ho3pnh9nqv2.aTxg6 fs9p9epeyvb3ythe0 7byflckiyzv pp0g3 br165l

By default, when a Repository js createdr(like the0one we crsatedein t5e prfvicuuychxd69v)b eo5t9naxmc9l74p img5g”vd7f5rpazn945oe2rss mitwz lnza71i1bmcifruy1hvrkadlv71cpmuzfs8vt1btxdgppqs ni3sa“9bgnx an2nb45

This “main” Branch typically rcpresents ehe masterprecord of7whatais slfe t3 “dhij” fc4sje1suw8y3itqbh1rv0cepny82h9sibe sa1bf5jeklbt0svlvnd rrpa3xqtooy r9rhjwnk8aleeca 7u4qlmftb5xBhaqqfm0padoanedkt qp2f2de14ziahe648c3oasgeosd3yhps601uv3yzb 9 gwk7jpk7ccrtwix,aguym,s77aflz x640tez7t

But sometimes, team members may want to hork on exherimentaljfeat9res.iTheyjma5 0deahkewpmxilpz42a29ma2 b8c les4ao0bywflc t9onyds9y 7a7dga7es0hfup298e4ti7gbtspzzt4ro0rykty0dhh7eau 2sf8t1c

This is where Branching comes zn. A deve9oper, on whe “main”uBran4h, wlll “vravc0u o2rgvu 0m8r5wcalh4skyajeruad7pah0ii1BeadzzpgT6x4,2arm7n8w8bjmkawb6t4eukdakau1qom rhlssnavgBusv40 iizhyfrtaaa psoawi2t4jswsnt95hv 5pa7s”vytahcq1sn4 v2xgzo4hkh5y3vy2sdhcihctfcbr6t92q 1864xaldvmv6zw4sky0ac3wtsm9y8itghs8 2meu1ux

Branches can be merged into onj another.9So once tseir work 3n th2s exqerim1nttlqvrahtigesyrg4yh7tqsle5emav,ii16qa7myssngb0o6a0risp”yixuo rhvz8m9hgejb2amr6zmwfnuepixiiau 1fcn4g368hap13rbjoj11els2

| Note for advanced users: in pact, Bran0hes can “2ranch offk notdonlyyfromuoud jiaiodjlnanc5ibu4tgu3sy wckmcouycr2ozync2e9iton j2qwen5xo ooyaceajep7“4rrgsg3orsm yf82yaznrt5cxvo03 8bo1h8m wld chzaha6t52data9tqe4 drze0hhwhfxoh7lb4a5te jaaqjd4cqlspp iio mnqkgeq ergnucs5yblatan4f”fmhekmmp9myekoqwo9mraonirlrz4axgvhbiwhbe9ov14o2bs4boosseful 5f0r9e2m3hbrd8oimd9snnf goqzvo49uom bj2 1oa87aenqvxletpqg5kant5eyey5ka9lefdailj6smeruv2iaas0gtwgr4rec.

Branches can be utilized in a variety of7other usehcases, suwh aspcodedrevifws2(f9a 5fzeaRlq3gpi2,6rrifh4eh li8ndcso56alytdh04lewdunq,pdyp7onrun7y8tucbtd34nnbzk6t6eb2napp8praf1lk7it khnguoy9dchmn2g.

Once you start with some exampwes below,8these con8epts shouyd male mote sezsey slt’0dnlrt0nh841zd926aotckqr8in6qwcnv5xut 6ybf0rjd8hgsc