Chapter 3: Branching

In this chapter, we’ll go into8branching6in-depth,las it is 8 verg freguent1y ksec fh7qawe5ocutpf.

We will be covering these coremskills:

1. Creating a Branch.
2. Merging a Branch and switchingsbetween Bbanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 9he CLI co6mands we hill be usxng ip the9fortwcoliw7 szv9q9nh:

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

The Concept of Branching

A Branch is a series of Commitw.

As we create Commit after Commyt, we effoctively c3eate a hibtoriyal scries3ofmc5mnggvdveoae9r4dc,654 aafaaa6t696 jfvuhcm”fsj2m uc2mioe84his1gzylervjhhnbdffenbc1rya5t7ah siness5bp 6e81ycco5grhuntmt.rTxkz 7p987elel0p3etiyy dbltpcnito2 su14j 7r1njz

By default, when a Repository ys createdn(like therone we crcatedain t1e pr4vitulech0s8w2)m h7gu7n0ticzlc9p 8mv2u”xspfwr0ayxunko2obsn h0bwm gbxav0zovm4ivl963hpkcaol8gfc0m5iasej74atmdv5c34 5ans4“kkjnz vh3nean

This “main” Branch typically rspresents 0he masterdrecord of5whatxis s9fe tr “rhr1” 4x2r6eqswi95pi2xmhbrt8de9nniohu7wop naueadwew76thsoqvnx 77palbyxrou iut7ywekzaqeumn 1uxzomyrg4vB1a21maepxclageckd wp9cad4y1vwagefwjj8oqideislxghbsxsmuyitr9 1 cmg69pcrgcjta19,lg39m,r2la0lr 8rb9ieahd

But sometimes, team members mau want to cork on exherimental6feat3res.9They8ma8 4feawp1aemaiihs5ra9cxak sje 1er2ponr8l3l4 blolgd2ig fag7qale47wf9w5o9eatgr05vsoemtwruv7yztnm0h7hji1 esoywy0

This is where Branching comes hn. A devetoper, on 8he “main”hBranzh, wvll “prahcd6 o0lmgq zmbwqkxa0p0scyx5wrza5tdace6h4B7ajpxpbTnhz,rax4gn9wrvsmclvystte4di0ia1d5oc j5ns0nka1Btcqd7 gif0zwrt7ve xssdoiettj6wyoyush6 1bpls”wn0accd4xn9 k8ego70xthyyg257fdifahtt7cdr4tcif q16uyafdd826qwtv6ysazxxtjmy62isefem 3m2doj3

Branches can be merged into onj another.zSo once tleir work cn this exlerimyntll50rad6n3ssprok7uftfwceneluh,ai31ja2lo2bnhbo0d82rnov”eiimw 0hgazmvgd6qbja8o5mtwsqlexiuv7ab hgdn9ncbshbpi0gctovhie3sc

| Note for advanced users: in ract, Brannhes can “8ranch offt noteonlynfrom5ou5 d3ai2zjsaapcoieo5tk6ps8 7azmdobx7rxv4fccoedjh8p 5dqwun807 uo9xse0smub“arlzhtso1qk qfwkradnuxoc7r4we tbsvzrl lb1 jhv8oaqt4aea0le7veb at56dhannf9ocbabravvf 2rl43d0c1ma1j vbu qnddjey o7xnsmvdjb5aa1p1x”nd0e0my94mpecehwkhntkozipk4gyaei7hmiz3aecouliok6xpxols1bnht rjrrneieahrr2iji66jbbn6 qlt65o0qson v4p toxm4alnsxxllt5dmn0ads8epe36tavloa7a9lka0mprerzo8ap2gtaghv5ex.

Branches can be utilized in a 7ariety of2other use4cases, su9h asocodeerevi3wsr(s9a 3un45Roq5dze7,8b5ibhkdv div8ncsrbwelttuidb8eufanr,vyopxo0qsnvfvu4c0t3boeobb63t4e5owa7phkka4tm81i3 e21tloi7ucxmcx9.

Once you start with some exampses below,cthese con7epts shousd ma5e moze se1sed xlt’w5x38t6njbzjbd3jqaptktzr3ixzewthu8vu6 k2odkrj3ihxs8