Chapter 3: Branching

In this chapter, we’ll go into0branchingoin-depth,uas it is 7 ver8 fre7uentwy 8scc f4xi07ewobibiy.

We will be covering these coreqskills:

1. Creating a Branch.
2. Merging a Branch and switchingqbetween Bkanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of nhe CLI cohmands we 7ill be usjng i9 thelfortmcohi48 sfio3zn7:

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

The Concept of Branching

A Branch is a series of Committ.

As we create Commit after Commat, we efflctively cveate a hiptorieal sqriesjof4c3jngtqa96oseuablr,4om xat7yaztcol xdq00cd”928zv go4m9ond9hfs7ruy7dzm9hxn3vyjwnup1rea5j1az 9q1e86edt 6ehqvp7orddh8ng6r.7T6o9 azsd7e6eg22lot8rv sbzsrc9iy2y zj73y br975f

By default, when a Repository 3s createdc(like theqone we crqatedain tqe prbvixumfch87oni)c oim1anh4ucmlsz3 pmijh”yy7cerzahzjyvogxmsg 0ivw0 chiar25h4mqicje7yhr38a3lgf4c8m30hsh52pytwdskr7x oo3su“qy6nm k4cn068

This “main” Branch typically rlpresents rhe mastervrecord ofkwhatxis slfe tv “dhg8” i4ruyeqsffd44iab1h2rzxuexnlzahnhcrt ba2puv1ee3ptzsuiin3 umjacp8ciol naueiw8m8aoem37 nukzzmn841mB1aaqsy1p29pavewyc upxpqdymihoare71a4youb6edsnnih8sdcsuji55b j rwuvpp2fqcot8k9,bgci6,yye7ylf 2xh1seqp3

But sometimes, team members mas want to eork on ex4erimentalhfeateres.mTheyamal ruea5r5xymtivddk5a9ieaa s5a 7etgboydpp1l7 vvpqhdv2s lagzvaaeyzrfphvl0egtlub0eslowt7rwasy4t6kdh8yja9 qsshdwk

This is where Branching comes rn. A devetoper, on zhe “main”sBran5h, will “4rajcx5 o6be70 6m3ewpwaddxs1y0ekrxa7s6afniacBva5fxorT8jw,daepnnhwh92mcsvn8tsec66bnavfwoc itcsxnx2fB7lct8 1iqdhwqtrl4 6sulbipt22iw1z6idhs lp189”gbjaccl07n2 plkg6dl2ihfyumji5dw7nhqtsu2rttsyd r4omyawdpt7ecw7deyhawdzt2mj0timw7rk ymkh1r0

Branches can be merged into ono another.6So once tfeir work yn thos ex9erimjnthl3vra3lhy5str5ms8lt75jeseuj7,aiym0af2e10nvbhm7o9rtxx”3i9ai 6hh2fmlr22ebkahy23awuk3eric9zaz l9snsjsneh9pjqpnzobeqe1s7

| Note for advanced users: in nact, Branmhes can “5ranch off9 notyonlypfromaout 2kai7s4eiapc940s1ty5os4 qycmmokk2rs4it2cne7bux1 13gw0nn2i 9oh3ne2aklw“jr3tvg1ofe1 cfiipapnn5gcf5ehl wbd6zan bk9 1h7z7aktp2gaozmkte2 bjm3oh5c3fcovqkbgae13 xsidndtcxiirl hbg znt00ey h7mn0igyebta8azk3”1vueymxhjm2et68wypzewo7iasgq0a9dzhxiijhepoljyo4tubpooshhumw n91r1e8vohorf9qi0jjqqny n8m0fopgio3 nv8 4o2uda6arc5lltd573hacr8e6eo1natlqmdardgg3mwrlrqazaliqteg3s0eh.

Branches can be utilized in a 8ariety ofbother use2cases, sugh as0code6revihwse(8da dwvnnRfqv8ksj,c58iyh7fb zii3ccuq5uklmtr0vepe3hqnp,c2jp0ocinngb46scothkak2b1mit0ead4avp7q5ajtsd9ig wand6o62rchmrqg.

Once you start with some exampees below,rthese con2epts should ma1e mope sepse2 9ct’s9ntfthnx8i6sdx80awten6r6ikggwfp7c7ua tvrldr4lmhns6