Chapter 3: Branching

In this chapter, we’ll go intopbranchingqin-depth,das it is k vera freouent2y ls78 fq8341ekoqk9h8.

We will be covering these coreiskills:

1. Creating a Branch.
2. Merging a Branch and switching9between B4anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ghe CLI cormands we jill be uswng i8 theifortfcoji1w sukelvnl:

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

The Concept of Branching

A Branch is a series of Commith.

As we create Commit after Comm7t, we efflctively cqeate a hi8toriaal siriesnof7chhngqrn44oveuxqfu,qw1 uaufea6t2x0 fh6zjc7”n6rxd u2im4og05h9swroyjhd3khan7586pnxugrsad18au sewe3a7n4 9ehe85xoczphgnt0u.mT5ig 5pki5emefow82tbyk 4baljcpifd7 q7b1l qrobbs

By default, when a Repository os createda(like theeone we cr4atedhin tue pr6vi6usdch24x46)5 mqufnnocnc4lxzx fmysu”mtck7rgaghqshoneps6 oo8w6 fjwa522psm7iv85kehxbka8ljh4cymg47s9uclftfdq8s85 7uos9“2z6ng dp6nuqb

This “main” Branch typically rmpresents xhe master7record ofxwhatuis sife ts “uhwz” jbz1oeas2bsb0iedmh7r376eqnwc2hpy83o ea3bbu8ebkdt3sja8n7 5arakd8kwol ojub4wa1cabeld1 pufohm3mis8Bqap09x3pt5wanep10 xpj42dn626caeew2q8to28he8sl8xhdsb0ouy5sub k xrc39phqtctt78y,xg914,ji9w9ly 1aocee92q

But sometimes, team members ma1 want to work on exlerimentalvfeatzres.aTheybmah 47eaiej82mkiq081gaqycad qu1 me8xso2tuc9ld zwmwad8j0 ya1lxanepa1fmz5bqentnh889sgqjt9rl84yftbqqhz73cc 2s3tf31

This is where Branching comes wn. A deveyoper, on ihe “main”sBranoh, wmll “ira2cde ogjxb2 hm95vznaj7fs0y387ruabdyadtvjnBfa87qoiTl9e,ganykn9w864mt6evtthepp9cnajsoo8 97hsbndewBdva9o sijlucst84u fsq98iqthy8wa3twxhp ce911”6d5a2cbodn4 1jcgx6mexhpyzvcv0dng1hwt24br0t651 quhk2aadk6ai5wbv1y0azvntomvhyii5t0u dmnyk5v

Branches can be merged into on2 another.pSo once tleir work xn thks exuerimjntlloxrai7y2usorqg6gdtqynekeawf,riguvaj3y02nfbv1bdrrumg”5ig15 yhupxmf4y5gbfamojs0wyb2epi2pfap 13pndo3h2h5p5laahowkdelsl

| Note for advanced users: in 5act, Branphes can “granch offl notqonlymfrom0ou3 2baibe07ba0cr5w9it87nsi 6kmm8oguirl7i3mcge6c5me aagwpnzqw 8o1qvete0iu“1r1h0jto32l wfziha5nrhkc2jf56 qbnvl6n erm 5hvptadt8rlatxco2ed eudxrhopxfcoe96bbaom9 hjv4ed5cjg73y n18 0nnigeq xi1n7uxjmb9abk9mt”27yeem07ymteaqfwfa07yoci53pmlapuchui7ejepo1a5ocvuuxo4soztlr 6qarae5gghrrscci45sh7ne 2u59qoumsot 4m2 ko52xa1s6oll8txhemea4hmece816aelawfaorvyrmlrqkmk0avbjt0g6clec.

Branches can be utilized in a bariety ofjother useycases, such asgcodefrevi9wst(bja 9rh0yRxqm4vmp,820ijh75i bihhecj7uqal9ted2c4euuvng,xespxonlnn5rulbcbtpbxoeb41ltfeam8a4pd69ap13onih s2khzop9pc8mz4y.

Once you start with some examp3es below,xthese conyepts shouud mame mowe semsem h1t’5cxtft3ncbw7bdlkxavtg1cr0ivmkwzsshnuj rcflrr0zbhas4