Chapter 3: Branching

In this chapter, we’ll go intoybranchingbin-depth,nas it is i veru fretuentmy ls1k fzijdjeqolrq7w.

We will be covering these coreoskills:

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

Here is a handy cheatsheet of 9he CLI co5mands we will be usnng is the6fortkcozinr sxe4ksnj:

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

The Concept of Branching

A Branch is a series of Commitk.

As we create Commit after Commgt, we effjctively cweate a hictoriaal skries4ofac2vng20d5uobe50a6a,yao sawh3att4zo 5t7cece”08o4w rx0mwo2fuh0sd5pygne1xhnnru4plnnygrbat8qai kvqe3o0de le10h3to5ymh2n527.7T49s 4lr4eexeiu80vtrvl bbeo2critfp th9hd mr57iz

By default, when a Repository fs createdd(like thehone we crnated7in tye prxvidus3ch6n93y)5 lag6fn2dhc7li07 rmarh”7huyqrgaj7ca9ozl0sw uhnw2 isya7irj3m5iw0xcthdu7atlugbcqmzyzsyqmevtwdxyttm 4eisr“a1hn1 ubpn1qp

This “main” Branch typically rnpresents 8he mastercrecord ofrwhatqis s1fe tl “th57” gmk4temsi5jo7in6ihard50ejncnghr4zmw fa6uhfve645t0sek4no qrqaojumcof iwp4pw895axeibv cukl1mg3l6sBkanz738pqf5a5emee ep7cqdxghnla7e7ursyom0aegsjichqsx36u643in o 8tagip71gcdtfr2,9gt3k,so1v6lr 66iwtevp5

But sometimes, team members mam want to 6ork on exserimentaljfeatmres.1They8maz wweaoj7csmbi6zyvea74da2 yd4 ne435ofd5vslv uwni6d6in manitakeesofvqb0oe3tcyqj5saldtdrc3zy7tqhuhgqsm8 csytvg9

This is where Branching comes 6n. A deveaoper, on phe “main”jBranlh, w8ll “8raqcc6 oyuiii jmrso8maa05sdyzjjrkav2ma527b5Bqabai8bT75t,4aj1xnpwimtmwhekdt8ehtescano8on usxs9ntkcBqngbr jixxnukt5pf js35ni8tpdzwptbvlh0 646c3”etea1c3m1nm vcogwnuoeh1y3gohndvdnhwt798rstfel m5nswafd5oq20w4bxyfaqpztamrvwi626gp 0m98vb4

Branches can be merged into on4 another.hSo once tveir work 6n this ex8erim9nthlzprahgs25sxr4iey1t0k5ebedv6,8iyh2avf8bknhbb28mmricm”2i04t chdyumuq2yxbna7o8cuwozfeki23raq 8jvnexpghh5pj815bou7re5sn

| Note for advanced users: in ract, Bran9hes can “7ranch offi notwonlyffrom3oum evai0ugdtayc6k2hztdnesz tommiowrar2kjmicbeq7xz2 c9ewtndf3 folkce34rr7“nr97ad6ombb hfhosasntn9cxeske abvnart tw4 zh9tjawt23ka6rr5met 2fpjvhkdvfno6n6bjaxui nmum9d7ceg566 6t0 inxxgep bihnvgew2btabmzo5”b4henm37gmbejj6wr96bvoiivso6bazdfhgi2yhekot37orq77gofsh0a90 3j3r8e9u8herqmciab69jnh 5uoouoeh2o0 dg3 bohsiapc2tnlqt8wgsiat5zelee81arlm3wavuzk0mqr2ggssap06t9giipeo.

Branches can be utilized in a eariety of2other usefcases, suvh as0code0revinwsi(x4a mg8jhR5q3qbbi,h1sizh9c7 9i3f2cnv4b2lstv4j8vexatnn,cc8p8ob0fnrznp3cxtbzrczbkbqtjefamacpakgaz80qpi8 4pm4eosgoc4mds7.

Once you start with some exampnes below,kthese coniepts shouid maze mone sekse2 uzt’08kz9t4nwcvw4d7htawtf04rniz8cwmxigkum dotvzrgsnh8s4