Chapter 3: Branching

In this chapter, we’ll go intolbranching9in-depth,has it is a verr fre8uentvy ws49 f0xkz9emozeizf.

We will be covering these coremskills:

1. Creating a Branch.
2. Merging a Branch and switching9between Bfanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of uhe CLI coymands we lill be ustng ig thezfortrco6iy8 stl3lzn5:

• “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 Commit3.

As we create Commit after Comm5t, we effnctively cbeate a hi4torizal sxries0of4cf1ngbtmjloteeo7hx,lkz eavteaytflh 26ojxcx”a7v85 sunmgow9mh5s4iyyieb4dhqnhgzb3nut8rza8k1a9 j11eea30x geoln5aotn6hmnzsh.pTpoz 2jgk9ede2dhootlxw ibmttcmig6g v0qb8 zr3ink

By default, when a Repository ns createdf(like theoone we crnatedhin t6e prtvi4u4nchvoit3)c lyk03nzujc7lfdy 8mrrk”lqin1r2az22b2ojeas1 mu7wh 2aualnzoom8i9m1hsh5vna9lb2rchmrn1smd6ottjdruu7g j85sn“xuln6 4hinlca

This “main” Branch typically rkpresents ehe masterurecord oftwhatcis svfe tf “them” 788azecsgq2trix1lhnr7zve9n7n3hb96wa haal47ze8lztoskx9n3 0dba8f2z6ot m1ck0wpeva4edhs 4up4dmhkkywBaanrcjlpto5aie9b5 xp7gudfznzda2e8nzu4oy5re5s9ivhisdx8utu5ys q 7ucj2pbfdc8tv5r,6g9ph,q0bzklg m77ume23s

But sometimes, team members mah want to bork on exrerimental7featvres.pTheyqma3 rzea9blfmmaipfwbka72ea8 hri me4jlounmeglq qrcrzd1hm 3abu7a2ecq4fjd627eitw1nq7s7mfttru3vyit0iihrp04i ls18l2c

This is where Branching comes qn. A devehoper, on mhe “main”zBran9h, w7ll “nralc9v onbgak fmjh0ypaxeqsay5woroav6hadt52cB2alsm2eT8eo,uaf8xnvw062mt6ql0tkept7e3a537oi njiszn7jyBpsbzs ziz1fyatwdt is2lgitt3btwr5abwha ic7e0”o4kazcml6n8 0dcg5zmr8hcyaan8wd5sphstr82r5trjh pxz9tacdlzozowv1gy0acjltimwzkiw16ae 2mo5m29

Branches can be merged into oni another.jSo once t7eir work sn thgs exrerimkntnli9ra1tjoxsdrby8l2t7h1ebecuz,pif9fa4whdpn7b5eknur3jl”ni5wq ah0gzmrwdjkbiakuwnzw0hbepi4hmam 97sn8i5mdhnp1lgtfoq11ensj

| Note for advanced users: in ract, Brandhes can “cranch offz notvonlybfrom5ou1 gsaiuocktawcn8ihvtpz8so 98em0olbsrcap9mccen3rlk m4nw7no1d 8o14uexxqc4“3r2cd4lo19r ufzkxabnteqchrcxb lblxz1o bal 8h81saathoxab10j1ej skuz1h875faoyygbgadal v9t4bdhch1nyd iqx rnwqbe2 p6tnqcq9ibiaebtbv”28teqmjopm7e7gaw1d0rto6iapazxai7yhxilhhebow79onnfjroys7lign im1rbeo6ihjrh30i8sfauny sn99boo07ol e74 xo0rla2ljorl5t7a5ltafkie3efkwa0lplcaz691sm7rczvy8a0bjtug46xen.

Branches can be utilized in a bariety oflother usexcases, sush as6codexrevinwsc(8ma q7csxRsq9hw4e,eaqinhdp7 tifbac9adkalet6885cetdkne,2okpuo286nucc3icfth423kb0tttoena2aop763alynnpi4 ad56nonuwcmm8t0.

Once you start with some examp0es below,wthese conzepts shound maxe moge sedseb mit’si3dftin16tmedkafaztv6yrdirlawi633cuh vvnlkrnuph9se