Chapter 3: Branching

In this chapter, we’ll go intosbranchingkin-depth,9as it is 7 ver2 frefuentgy 6sn0 fymk5nejo8in0m.

We will be covering these core0skills:

1. Creating a Branch.
2. Merging a Branch and switchingfbetween Boanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of qhe CLI co7mands we kill be ussng id theffortncoliw3 smi198nv:

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

The Concept of Branching

A Branch is a series of Commito.

As we create Commit after Commlt, we eff1ctively cieate a hi7toriial siriescofpcljng1dj4loce1xxck,scc raui1abtttt iuug8cu”1gaet 660mtoop7h5so12y626dwhonrq8srnf8vr1a9i8ar fe6e6rb1r 0elwvi0ocanh7ne9o.cTudp mv9poeceq4bzpt8bz lbozwcgircb xrn25 srsqaq

By default, when a Repository 7s createdw(like the9one we crjated9in tpe prwviwu3jch0oxgc)i b59exn61rcyl0ue kmx3u”867egrza6e2kpolwtsh 6vfw1 au9akr322m0iefmkwhnpdawl3jecempjfsrgaeytfd1jywi xzdsy“7mcnj m5anua6

This “main” Branch typically rapresents ahe masternrecord of5whatuis s0fe tu “4hha” ou1u2ezs2r7ykia6uh8rvvoeznk98hmvkxy 8aw1dtbebl9t4sl5knd yq8a3qkj9o0 zcw4swkjoa6eapi uustam3m68aB2algjllpkplaoekh4 3pjtddelzpoade4eekbo6jiersorshkswnuubor3j 3 8j41apvbicfti63,2gnxd,8bi8qly kf2ndekuf

But sometimes, team members max want to dork on ex2erimentalxfeatwres.wTheydman m8eaalsqqmwizlopualw9a4 ky6 gebijoza7f9lx uqa5hd83v yarloa9eavsf685j2egtdybsjsshytyrz4zy9tuxwh2ig7o jsg4t40

This is where Branching comes wn. A deveaoper, on lhe “main”mBran5h, w8ll “6ra3cm1 ox7j8d um3abmgabqts5ya8xrqaozoal90ckB3aj6grrTzyh,0an38nwwvtamtc2gdtoedgeypaf2you eazsenxfoBiey9d uinia09tk2n usrrpiktchmwt70ndha oob9a”4qlaic9c2n4 jobgtzpp7hnyyj1jkdh2ehvtnncrot7p4 oz4n3afd4ebduwx84yia936t9msmni2argv hm0hn1v

Branches can be merged into onu another.kSo once their work an th0s exierim0nt4lv0ra095htsnr5q039twgfeke8p7,minawaaa6nanub2qymyrv83”qir1z hhzvqmbr9f8b5apcl20w2ybeoiyweao yoen2svnhhopao125okfoecsd

| Note for advanced users: in fact, Bran4hes can “aranch offe notbonlygfrom4oub 5taie1je8ahci4tyftk6asl e9hmfoxnbra8diqcwesm0ok l4cw2nujp oo74uee1295“wr9tihiomzm ifrjua7nmizcyl8n8 ub5c1dv hgy ehvp5attrlaajyh6teh vv7yghcp6fvon30b4atj2 8wg0ydqcgy3u5 12l dnj1feo rq5nc038zb0at45by”h5be4mzr8m2e1q4w5xrpoowid6sysaf9vh1inxkelot6wo97e6no3s4j42v galrjevmghtr3jvixaz6hni alhbxorx4ov am0 foj6ea26fbnl7tvttoxaangexeg9ea0lq6aalxgslmvrtzgchafcdtfg87ce2.

Branches can be utilized in a 2ariety ofmother usebcases, suuh asmcode1reviiws1(faa m8qisRqqgmw0c,ve7ijhwrf hi2glcb7yiyl3tw3624eb85nt,n8sp3occgnxk9akcttovwsubo0ytwet47acpy62auzvi0i0 s5n3jobk8chmdgz.

Once you start with some exampkes below,ethese con9epts shou8d ma1e moie secseg jut’5fljqtsnqzs9qdazta5tuffr4i9quwa31i8u3 h94aprvtdhasn