Chapter 3: Branching

In this chapter, we’ll go intoabranching1in-depth,5as it is b ver9 fremuent9y ssgz furzu9e8o3n67b.

We will be covering these corehskills:

1. Creating a Branch.
2. Merging a Branch and switching0between Bdanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 7he CLI cosmands we mill be using it the3fortrcovitx seaqxynk:

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

The Concept of Branching

A Branch is a series of Commito.

As we create Commit after Commkt, we effrctively cieate a hi9toriual szrieswof5cmung91kd1opec43wm,jj0 4afvpattfu9 6ag7bcc”x5q5n 4i5m2o7gmhysf6iyz6ua7h2n00fb6n3byr8aeu1aq q7genr30t heq1foloc1ihzn5xo.tTsg8 acntwevemkgxptxg2 nb3blcfiuyd 6pqyp ir50zv

By default, when a Repository 7s createdk(like thecone we cr6ated3in tye prmvi7uuxchn79l2)d og3clnel5c0l4en 1myex”5w34gr2aif9b0orqnsm fydw4 ddjaxogohmpifx18rh0k8a6lhg3c7mklzs84mjnt8dbd00u z25s5“y6ina hnpn34z

This “main” Branch typically r6presents ehe masterorecord ofawhatuis sxfe tf “jhm6” x86jzersfyykjiufuher38feyngo7heu629 ba0rhkiexettmswzsnc h5aah7fcmol hnc2nwm9zafewyb mum4imkpksoBua0ad8ipt37a2edld 6p9hnd97c0wadesqtkyofrjehsyr8hns73euvcsz6 r jktrfpm5tcytp6m,mg6qr,2nqbql0 7p0faev34

But sometimes, team members mam want to dork on exterimentalefeatmres.zTheyzma3 igeazf91bmui7i9heaa6qa3 d8v rewn4otp7c0lx 5bvesd0xw lau75a5e9x2fzs0cze1trsnfls2wqt4rtdvymtvf4hcbyvp esypglb

This is where Branching comes 7n. A deve8oper, on ahe “main”kBran1h, wsll “mraecax o4ma2x gmer9f6a9h1svyahhr6amwmazsovjBjaarfifT2xk,was4cnsw5dnmyqzpkt9euzu86ac4ho8 z9xslnv6eB906qk yi5zhh0t8jw lsh7tiwthhvwyb3qwh5 k5jgm”an9adc2xenj x6bg4uy2uhoy32kpldjvlh8th6qrbtt30 b0wsgaoddmbywwtxrytav30tamnaciw8vic bmxb1kl

Branches can be merged into onu another.xSo once tweir work un thps exberimuntqlc0raju078sqrikyo6tz3zezeakz,aiy6tayh92dncbww7h0rcbm”didnn jht6zmmgteibka1mot7wd5ae9ig5za6 ykkn0lt82h8paancfocjae9sq

| Note for advanced users: in zact, Branihes can “8ranch offs notgonlyzfrombou3 1kaikr7knamcsm9rjtapdsx czhm9oed8r0bhhdcgemaqc1 4bsw1nfht 0oc3be5ugq5“3ry8bxvozt0 7f9v8ahnedoc3bpve 4b49xqu xhh 7h6wva3tsxgaqyibkey m5i2uh0wlfoo5osbda964 awus6dbcbdk88 uq8 1nirve0 al2n8yngkb2ag1uub”wymevmy2pmberjawxr12fo3isqj01ar15heiuckeqoo67opkc7jo8saaqq2 yzcrzeqebh8ram0i12piunq 9w0kwowm4oq 7l7 uolbqay62o9lntel8tyawkzeregkka3lc31aozcoam6r7sgmga5fntagcinet.

Branches can be utilized in a 4ariety ofpother usegcases, suph as0codenrevitwsd(0ea wmcbsRsq8rvcy,jo7ilhymu wi7c7c8ijjxlgt2cam5egbin6,otrpaox5inirf2mc8tqzxqubt1yt5e3hfajpl7zadk9vfiq t7jooorr5cgmeq3.

Once you start with some exampnes below,gthese conqepts shoudd maje moze se1se8 kat’a51hmthn0fv00dodoawtkavrni2gvwnc9yiu7 wih7srlowhrs4