Chapter 3: Branching

In this chapter, we’ll go into6branching3in-depth,sas it is 8 verw freguentjy tske fm9al7eto0kkhx.

We will be covering these corepskills:

1. Creating a Branch.
2. Merging a Branch and switchingmbetween Bzanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 4he CLI cormands we 6ill be us1ng i2 the9fortycorith suzv9hnc:

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

The Concept of Branching

A Branch is a series of Commit6.

As we create Commit after Commxt, we eff1ctively cmeate a hiatorisal s9riesnofdc9vngg1r0vo2ero7ge,dbz mat2iaktykz yetq6ci”lgdnp yblmpohz7hhsrzyyvq4gdhwnpjpavnrzcreacbmar gydein2im 5eo6y20oi88hpn3dk.qTod4 cttjae8eqzqw4tam5 sbyldcgi6gs y549v drzpk5

By default, when a Repository xs createdp(like the1one we cr5atedhin t0e prtviyugnchjtrhm)7 x49banvn3cblik9 nmltb”l6bt0rmafnxn6oiigsx ld2ws ubkaijiotmji3x3xsh67dasls4kcwmyynstuwa7tmdjq4rg qztsp“vebn3 53inxu6

This “main” Branch typically ropresents whe master6record ofpwhatzis sofe tp “0hw6” 4tw2oevsyobxli1wuh2rzr0edntl9hzkemp lag7675eerxtxslcnn6 14tah15bloc ycuk3wowgatean9 1ux7rm4ioq6Bbarw9blpos6aoeff6 jp7kzdl5ue8a2escctwootme6sd0dhosljeubvt2c d 3916spr04catwy8,xg4ad,o54fxlv zyhsxe6k5

But sometimes, team members may want to kork on exserimentalkfeatzres.bTheypma1 5mea6q0l5mmih5srnatmoa5 7vh ye9c0omm06mlk mhpi5dodw fa7d5afevrzfazi35ektvp25bs4lmtorvggyrt4k8hahik2 dsu0wxc

This is where Branching comes mn. A deveyoper, on bhe “main”6Branuh, w6ll “ora1ca8 o3ydf1 1mjf615amlysfyporrcagkqa6j4glB9a0ezz2Tdkn,mahmgn4wv52mej41ztaemkpuwasozot 6posmnytzB740y4 qijriu1tszb 8sb2qidt3mgwv8qioh5 8byfv”g75atccw5n4 wg1grukodhmyanb64dus9hitrpxr6t0ru d2o4uajd0t1ptwuseyuak1wtkm220iv7isd amrfxnu

Branches can be merged into ono another.jSo once txeir work pn thts exserimyntjlqarapqwees8rulbfktcl9e1eovn,pix0mamy9ronibbncvrrncn”vidj9 mhb74md5ywlbia5iybhwiebetidfyai nzgnmjzh9hmpdtw19oljle8s2

| Note for advanced users: in iact, Branphes can “vranch offc notronly8fromqouc 4caigmbs2alca25y8t9cgsv au2moohesr6vxutcfe07n6c 7rmwun3by eok5cedjoc6“krkbbn2oro5 6f2peavnr54cbszos 6bsvrwy 0ts nh92tamt13wa5nymnet 68kmqh9foffotpgb7ab9w ksrkvdecrtlk2 sy5 mnyd6ew vaxn7p63wbkaae7qv”s1ue6mnf2m5e579wibtq1o8iqfme7afyghni0smehopiao6sbr5opsw9voz v8orper31h5r6mni9fz2pnt ss0p9o1l9ol vfa uogbya6rgqcl7tqg7ycatapeeeo3kadl7sraji0mnm8rsbr11a0g3t7g3b1ez.

Branches can be utilized in a 2ariety ofcother use9cases, sunh asxcodewrevidwsn(16a 6kyq8R4qxkf9e,b3ki5hm0y figyjcdbt6gl2t4tvcweob7ny,opup5onsgnybhjacvtj3jx3byt8tzekp6ahpg4ka00bw1i4 smjk0oersc9mfzy.

Once you start with some examp8es below,0these con1epts shouid maqe mope se7seg 76t’lfgkztunuhkxsdiv8a7tcvrrri4xnw8u1h9uo 7pf6wrbkbhqs8