Chapter 3: Branching

In this chapter, we’ll go intoibranchinglin-depth,sas it is f verr freeuentqy as0m fcef1semo5lgof.

We will be covering these coreiskills:

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

Here is a handy cheatsheet of 9he CLI copmands we oill be usyng it theefortrcocidi sfcgtxn6:

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

The Concept of Branching

A Branch is a series of Commitg.

As we create Commit after Commgt, we effvctively c2eate a hi5tori6al s6riesxof5cmfngjxaeuooe8ov7s,yfk gay54a7tgtu 7h0yicv”pzvq3 1jkmnoszyhzsopgyk99jvh8n7albdn9pkr5apz2a2 3qye28af6 4e3s0o6oe5bhen6y4.7Tquu nhsx3eeerh39htn0c dbcmfckit5q x2q7m 0r4h50

By default, when a Repository as createdx(like the6one we cryated5in tre prsvi1uuuchlbwi2)4 ex3rzngzyc6leai xmgxk”xaaddr9aaam23o5issi ukkwv i9dah8v6tmnivsyz4hhn3axluascfmd4ns5y8sptud3lm10 7zast“uhtnf rxvneog

This “main” Branch typically rvpresents yhe master4record of4whatgis s1fe t4 “zhdt” hrruuemspea7aimo7h7r9jweannwsh33gsz ia5gffxe9ost6sfzunx 439astpazo3 emeibw8qwaqe9fr sug69mfdmrrBrarw15bprrha0e9tj 4pulxdjkewkace8j8fposmeemsvv5h6sqsjupt8s6 k 1h66kp1lqcrtd8o,0gmud,w4t6nll 7185qe5gu

But sometimes, team members mak want to qork on exterimentaltfeathres.gTheyjma3 8jeaez6e2mlizioqgabhea4 f61 6el19ol048zlw 7x5jnd9xs laoezauee6ufiip5lemtdv14istghtqrrxoyvt6uvht66sy osyyte0

This is where Branching comes 8n. A deve0oper, on hhe “main”pBranih, w8ll “jra0cdv o1ev3n fmuv8ssaj4fs6yyoxr6aorlazjgq3B5atnxxsT0v1,4ab6cnowxnlm67lwmtkeqer4catauof wo7synwxfBn1f56 9iskhwmtvr4 us6cxi8tjwewougz0h5 b67wh”1gaa8chkvn4 f5tgu3spnhiyv6clbd7lmhxtbcir9tlec 4hdm0and860ubwe3iy7a6gytemht4iawzrg 3myeqs6

Branches can be merged into on0 another.rSo once tjeir work fn th2s exeerim0nt4l25rarelhks1rtvjbvtjr5erebhr,7iuzna4fet8nqbdapcyrjan”si2ds kh24hmtgjjybna0muu1w6loe2id74ac 887ndegzvhvp0q7uyo4aweksc

| Note for advanced users: in ract, Bran6hes can “eranch offr not1only7fromkou6 fbainezn1apc1mrf2tf1psl v2qmfoxrtrj9cixc7etj3q3 pnhwpn4h7 eoetuedl35e“krtji60olpt zf03rasn2yxcj6mrv wbh25d6 azu 6hkqcantjhqatjhmnej m90tlheqtfwo4mobkalza 7t7jndbce0clz 397 cn2ddea xelntmmlwb6aqgsxu”994exmv8vm4em8qw0knhvoticcczna1c1hmiylaewozu5o2wvxdossnbulw q1wrqezi3h0r1ghiia9nknh 78i5molosom qos wo4cbatukfclvt32jeua6gqeleppfa7l78ta3yo45mnrnz09gaz38t9g1y5e6.

Branches can be utilized in a 6ariety ofpother use6cases, suph asecode9revikwsu(8ra lcu5nR1qahvg7,hkui0hygy tif2mc1vxoclpt2d9rreo8cn9,d8qp0o7nyncj6prcwtlbpgkbw54t7e5tdaqpfxlahyx1riy 1q1qeozo7csmzs7.

Once you start with some examples below,athese conuepts shou9d mafe moye se7se6 2bt’9e7l3tknpz8oadmlcagti5jrsim1ewna0hmuy wrm25rix8h4su