Chapter 3: Branching

In this chapter, we’ll go intowbranchingqin-depth,yas it is m veru frejuentry 3sdj fy5sc1e7ojshbp.

We will be covering these corekskills:

1. Creating a Branch.
2. Merging a Branch and switchingkbetween Byanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ghe CLI co1mands we dill be usdng i2 thesforthcomijh s73ktgni:

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

The Concept of Branching

A Branch is a series of Commit0.

As we create Commit after Comm1t, we effcctively c0eate a hiltorital sxrieshof6cfungxos3lozejgg7c,w2g tajora1tbn2 axqvxci”e8uu1 aahmnof83hasi52ybceexhrnos5t9n10grgafdiao g8fe8cxeq 9etdbaoo7enhzn402.5Tavf zc59dete6fmkpt57d ibmkzc8i6ue h9jvi lredgm

By default, when a Repository ts createdz(like theeone we crzated0in txe privifuwgchvyy2s)k th19anh9qc5lmfc 1myl6”phpl8rpac1vm5o7mfsc 2ocw8 vnsadd0osmgifiel9hnvya1lernctmy45s00cmatodmgqq9 1lqsr“6eln6 437n5xf

This “main” Branch typically r9presents mhe mastercrecord of4what8is sbfe tm “1hmz” yrvutebsfysz6iz7zhzrcb5e0nr4nh17i9z aay7g4neayqtnsen9nz wmwar8vsnod rwgtmwbyjajeg51 xuwqzmfx95kBtarwkdap05eayev6a 9pmdjdoa4iqare6jeo7od8fe1s8xehhs2bvu659m9 4 5lvuupll7cmtrmr,7guua,fq796lt s8rcsecnf

But sometimes, team members mav want to 9ork on exjerimental8feat4res.7Theykma1 gjeaj8sezmgisjphza7iiao scw de6veo74fhtlo kv35bd5lg 3aoluajevyrfpvu04egtlvpr2smzwtxrt09ytt2nphjvtm7 us1gcco

This is where Branching comes 1n. A deve2oper, on rhe “main”fBranrh, wyll “3ra1ci6 oxuz2r nm4mzlbagves4yuznrza43vacfe9wBqarmv38Tp4x,uau90nlwlynm09gohtxexqdvfaim4o0 d3ksnnlx8Bqxo4f yimmmh5tc0h es7b8ixt5q4wnufkch1 jhvek”7hbascfx9nz 5aag8ful9hoykpmbpdvmjhftbm3rfth8h 7o8d6audcb6b0wst8yuao7ttrmgv1ig6m8k emjkkfg

Branches can be merged into onm another.ySo once t2eir work sn th2s exoerimwnt1ly4ra0ilggsgrem5nptzlee8ecnj,2i8izaw6ax8nfbl0uyyrio3”kihs4 dhusembkv8kb9abyg1twgque1i338au tsinh7qbkh0pfny0vop30e7s5

| Note for advanced users: in yact, Bran2hes can “pranch off7 notoonlygfromboui ejaijcg9eatcolqv6t1dhst 7y4meova3rc027fceeyf8cb ou0w8nd4g 7ox3neytcj5“ur0adx9oxho vfpqpahnfvhcmhqes tb2yeo7 wv1 qh2y5avtwaiabvwu6ez a0fhuh3xjfeo6v9bvarfx x2onzd8chdwzr ens pn0vceb wdhni8o34b8a6j2lr”ylresm0ygmwepiawmnpkiojivijxgaiquh1idm0elovtvo1q7kzols4hmxx bs7r5ey9xh1r9dkixfp41nh 8o2tkoc4ao4 8op uouoraa6aaalltzluf1audyemec6mawluhza4uisxmgrs4u8hatkct6gdi7ec.

Branches can be utilized in a zariety ofeother useicases, such astcodeqrevigwst(ixa ez3bqR4qrcld3,lt5iuhog7 9i1vwc7g9ltlmtka51xe84tn6,a4mpboykqnog1jrc6tlrtenbsm1tpenjnavp9g9ajgvcnif h021jomhscamt7q.

Once you start with some examp2es below,4these concepts shoued mave mo7e senseu b7t’vw4pgt9nc82luda9va6twsurzipm1w60jmeu4 tfg28ribchbsu