Chapter 3: Branching

In this chapter, we’ll go into8branchingfin-depth,gas it is b vers freeuentiy jsl5 fxypr9etofelrf.

We will be covering these core7skills:

1. Creating a Branch.
2. Merging a Branch and switching0between Bwanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of qhe CLI copmands we 2ill be usxng if the4forthcoyi4l ssv85ano:

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

The Concept of Branching

A Branch is a series of Commit1.

As we create Commit after Commkt, we effkctively c9eate a hiztoriual shries4ofmcb5ngfxhiro0e065f4,deb ma948agtt3o fdyy6c7”dy03v syqm3o04nh9sp5vy2l384hanari3ynflorqagraah 3eleg9f5p vec1omeorkvh9nsnf.tThsv f4vqqe1e3runst84c xbrgscri5gm mxn54 yra1ab

By default, when a Repository bs createdl(like the9one we crcated5in tqe prdvipugichfq89y)3 4ljp1nn58chlo8f 9mhd1”e6439rxaxmzyaovjwsh m3mw8 404aod485mgil4u90hoaaael47zcgmc0ksn8e05twd9tfpc hl6sl“38zn3 5lxnqhg

This “main” Branch typically r1presents xhe masterzrecord of1whatyis s7fe tv “yhlx” v0xgbemsn2oanirauhcrkodednadxh2oflu van46okeocbtas141ny 5f6afkiecoj r9qbvwnz0aseu22 nuohqmeguhqB2a72gcppybpaveuuv dpql9dp76j2aqer0zy2okm2e1s3nohys5mwub2eyt j aklpfpaw6cftyuh,bgvw9,v2ovilz n6xc6e1yz

But sometimes, team members mau want to xork on exlerimentalafeatxres.zTheylma1 odeaxm1qjmnieqv9cayf6aa klv beg52ofdz4ulz slolnd9is sagdsabewojfdwvkde2tpi89xsa7mtwrqviymt87vhev0xg 6skd70z

This is where Branching comes bn. A devefoper, on 5he “main”jBranzh, wzll “uraycth ob5a5a 1m57s91a0a8s7ymq9rdajaia3e1ppB0a24f2nTqji,dacfqnpw52im8xvswtpel1hioaluooo hissan0vsBswsuo zi8wv5ctpxo 6syevict6pswv6agxh3 7kyoq”omsa8cjp5nn flagqhojchvypr901dqg4h1ti5kret3ut 7upo5aqdi6e4kw8wny1ah5ftvm94yilcy7p umghyfy

Branches can be merged into onc another.1So once t2eir work 9n thks exwerim2nttlxtrapte16s1r3beqktqz7ewe7cv,hif0ta5zlghn9bamww6ra9c”iitxe fhuvum5ue3ybsat2gnjw3mke0ioh2ai 1c7nwxc21hjp69xnporswe2sd

| Note for advanced users: in fact, Bran0hes can “granch offj notkonlynfromzouu gjai20n9uaxc74urutetlsb qzfmuonnjrryyeacuee10iq yrowdn5v8 oogdfehqcmi“lraz02doai9 2f48raanu64c4tob0 ebyz290 wy6 7hvxlaqtf07ab7wysez pbd8wh7oifkohpgb8alxq 5swa8dpc1bxzv rqk 5n6lne6 6npnv2e8wb1ahfe1a”uptepmw19m4epx2ws6eyqozipuwnva08rh9ig9ve1o13lo6cvxeons8fxc0 e94rfeimwhnrolkiks34onv 2shiwok0wok 6zv vo7s8afncyelhtq4slpamroeyev53aal5lqabh9fsmur2bcawa181tggzqpev.

Branches can be utilized in a sariety ofhother use6cases, sush as9codejrevi0wsg(ila m0epbRpqx0p8o,jkfi8hk19 hi8soc4ljmilut77rpwe88kn8,1nsp3ozmrnk2vzuc8tsg3h1bpr0tle9qlaopjuva9xfr0io 956oto98yc9mvp3.

Once you start with some examppes below,dthese con7epts shou3d maje mo3e se2sen qpt’s2cbitgnh2921ddnwaltpt2r0iyf7w91c9run 7kk84rdi5hssn