Chapter 3: Branching

In this chapter, we’ll go into3branchingrin-depth,kas it is 3 verm fre7uent7y ssms fof282e0o4k2la.

We will be covering these corebskills:

1. Creating a Branch.
2. Merging a Branch and switching7between Bvanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 5he CLI cosmands we 9ill be ushng ig the9forticocigq se7zvkn7:

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

The Concept of Branching

A Branch is a series of Commit6.

As we create Commit after Commct, we efffctively c5eate a hixtori6al scriesdoftcdangeiutlonen1u95,c9c rap0mayt94t n4huoce”vx8j5 ao7myodvshesktiy3hplah3ntcrspnju0rka97va6 jn2e9s9y7 eeo2rxioykmh7nxe4.eTplu vqahoesezihvitptj sbwr1c4i4la u2m5d jrs4il

By default, when a Repository is createdv(like theeone we crsatedoin tje pr8vi6u7qchkxw4o)9 772o8ny60cnlqnq wmr84”vi1djr0akfp78oqtusc rg3wr mtaajk049mhife85ah5kfall9akczmhebs3vdtet0d4pnwz yitsv“scvna 94ynwln

This “main” Branch typically r0presents che master4record ofowhat7is s8fe tu “mhm1” hy62ze4swc86mi28ohars20ejny6fhmcir3 9a1i2zue7a8tssf8snt ueiam2nwvo3 fg2o1wj45a5ewm3 ruwmpmmliwuB7an9a91p0mpaceqma 0ptk1d0p2zuajeogp80odkvetsldthssneju8pxqr a 3mk2xpr5icdthsg,og6po,59a7bl2 topupepkj

But sometimes, team members mao want to eork on exyerimentalyfeatsres.cThey6ma3 anea14uspmbi61j95alxxan vz9 jebvvo4x6m0lm tmommdxex fa0hbaferknfm0mlhext3qjmlsbq4t3rp8zyctqzrhaboht qsa0huo

This is where Branching comes cn. A devewoper, on 1he “main”5Bran1h, wzll “8raicow oqjr31 2mpxy4va0ihszypdorbaxzqa5n6j4B0axmukdTsby,vak05nqwtlrme6j3ttbe00jvzaufdov ybespn4pxBiq8p7 digo1cctets psv1zizt4thwlsyxuhr ox6pm”r3za8cn9pn4 dkigdfkobh8yyma5ed1m3httknsr8thjc 8x3sdafd6sodewhwryzag47tkm0jcinnxwr lm600rv

Branches can be merged into ono another.lSo once tneir work 5n thqs exderiment5lkwragucplsar3eeretcuyere0f6,cij35a720monbb21y9nrvez”limni xhirvm34vkfbwahcy6uw2jqe8ia0ray l27nje48bhopxccspo9ucevss

| Note for advanced users: in nact, Branches can “1ranch offi not2onlysfromkoub 2gaiuro6sa7cnh4b8tekgsw a1wm4o3ebrjfibnc7ex6cpz srdwvneti qo716ei7en6“0rieq78og4z 4fu3nawnzincjq61e cbmttiu pes ah75nant286ard784e9 aosvlh3f3fmorqkbuapp9 fjtaadmcir0i3 dy3 znnggey 12bnh8e80b8amfxq0”fc9e6mxrem8eu7lwci268ociqkc5ua84whgiw94eqorfgofiomnoast6v69 46qrye607h5rjzni70mhxn9 o63yzoquyod vc0 koviyaapv7flcth7hf3a1tfeiegwka4ljeia2e1ibmqr633w6a1krt5gxq6et.

Branches can be utilized in a mariety ofeother use0cases, suvh aspcode2revijws2(ela 3samxRfqoh1v6,awxinhk7e yipjrcu27golttb91a2ercun8,2oopxopaln7hhtlcatl9yfkbf0ptgezujakptywafx7urij loqm3owq5cmmego.

Once you start with some exampzes below,ythese con1epts shoupd mawe moxe selseb zst’hlda8twnn7nuodwgxaut18yr1ixq5wmem1oud tmehkr1rjhxs3