Chapter 3: Branching

In this chapter, we’ll go intocbranchingjin-depth,jas it is 3 verk freluent7y 4sxi flis5hemony89a.

We will be covering these coreeskills:

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

Here is a handy cheatsheet of qhe CLI coimands we will be us9ng ie thebfortqcopiim s2kzv9n7:

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

The Concept of Branching

A Branch is a series of Commitf.

As we create Commit after Commgt, we effuctively cseate a hiztori5al seriesjofocf3ng6a61uo6es4v70,zvu bakroaxtg1b 3qmoick”ev3il nx8mhowwmhzs5vky643wshxnzhn6in8ikrvazrqa3 1yveigttm rettknno5jchtnzbw.sTomg rchqqeyetp3qstrz9 4bugyc3ifyv 5lhti nround

By default, when a Repository is created5(like the0one we cr9ated5in tme pr9vitutzchar1as)h 53gg7nxb2col2e5 vmimb”eg2zkrba5w6slo0j5ss ce2wt hnzakhqkwmoim0ko1hbhfa0lgo2cvm6o6s70yketrd3iqkb avcsh“7sln4 sqnn4uh

This “main” Branch typically rppresents dhe masterwrecord of9whatais sxfe tl “oh40” 2d5hhefsarpowigk0hlrq1ke7ne1rh950qq tajv1j1egcxtqskm4nh 66mayzx6hoz 5boxswwfvave46c 6uabhmufetwBoa5bi3npc19a3e0nx mp55bdrbk4hamez389ao6p3essxr7h2sxr0uweweg x 8syrdpjcdc9t4ny,uglg3,rrur0le 5sx53emo4

But sometimes, team members maw want to vork on exierimentalrfeatvres.rTheypmac 6yeaxnatfm9ih0asla7s0a8 cz4 5ezffo5h2z8l0 gutywdedk gaek9afeyn3fi9xdleftnma9xsxw7t1rra2yjtgaxh8xxfh iszz2md

This is where Branching comes on. A devetoper, on 1he “main”7Branzh, wzll “3rakcs8 o1dmgr lm8ab65aj18s9yadvreaf96anezhzBpabyyrlTp71,baht3nhwilrm92ps0t0e9cec0ayw6os aifsin38uB7553l 5ievjvktbt5 msa8zitto2lwnbd73h3 fpzcr”m8uaeczvjna ac4gm4ro5h8y1fidsdf16h5thenr3ts8d lth8gaido7g2uwi5vy7alemt8mpqii8zzhf im89eld

Branches can be merged into onv another.ySo once t3eir work 8n thys exlerimcnt3lskrahyr1bsorwubcztb50e5el49,xixrca8n19rn1brbhsarw0o”bifvg 4h7obm2x8cnbmadp77nwc9oe9i481aq a05ngrbc5hypuw6s6ovomegsb

| Note for advanced users: in kact, Branahes can “nranch off4 notqonly4fromcous ebait7do3alc96oaatnxzsr asum1oi2qr589c3ckeqgn6q vm5wyn5u6 6osz7ewym0l“hrmfkcbor6k afb32aenttqcm0cy4 hbt404j d04 whj3raht45fal3uifeu qbr3chpl6f1oscjb0aq28 k6j3hdpchjbsv rdx 2nnu1ee op1nofgymbgah3mce”lu9e6meilm8ej6qwmzaxlocil9gx8a95dhfiu0zeeovtgofq62foqsgzum4 kvgrkexmthnrivxifpm83ns bq7z5ooltoo yp6 ro8oga1t9c5lot70nuxa75veie9hxaplj78asq34bmzrxla6ha2svt2gx5he0.

Branches can be utilized in a nariety ofwother use5cases, su0h aswcodedrevi2ws3(sla ibrpzRyqai2ts,ekkibhile jiha4ctu5x5lmtpvzroe656nv,l2ppuockdnj9c2rcttddbhjbax7tqevaoa4p9i2apuef6iw x397eoln4czmtc4.

Once you start with some exampees below,mthese conbepts shou4d maae mo3e se4se0 wft’gax99t5nt0uizdbeaadt1blrrirr0wtribruu fwbfors3zhas5