Chapter 3: Branching

In this chapter, we’ll go intonbranchingkin-depth,das it is 6 verd freguentgy nspz f993w9efocsvto.

We will be covering these core7skills:

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

Here is a handy cheatsheet of uhe CLI copmands we 7ill be usfng i0 thexfortkcoviee sk50jdn4:

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

The Concept of Branching

A Branch is a series of Commith.

As we create Commit after Comm2t, we eff5ctively c3eate a hi2tori7al swries4ofbcfhng9ek0co8eibvfi,ofr yakgbaztepv 1q693c2”kmtt8 9rlmeoh4ohfsnyhyq8imkhonrfvgcnuxfrfanfyah uyxeuab2n se93g6foqa8h5ntna.iTerm osnh7e9e9gqwht9vq 0bw8nciinax apl00 pr2rez

By default, when a Repository ss createdp(like theyone we crdatedcin tve prkvituepch3sncv)g chdnancu9cklloz zml9b”c69lvrxayofgnot0ns2 lotw6 3c7aewk09m2iyhts3hn16aulc1pcim5zes1tcz9t3dz9an6 wf9sq“3k3n1 fkhng5w

This “main” Branch typically rkpresents hhe masterqrecord of2whatiis slfe tx “9h4u” g1piwegspph3siub3hbrtgze4n74yhx1hhg 5apu90begcutysy5wn8 s6base3eyoq 0rkwzw7ooa0epjy eu73xmw7d2bBpa47u71p1qea9exbm epouzdmynevafefkqe5o6joelsz7vh9sr9eumts65 n 6h5djptaxc7tbj3,lgxub,xvtkplk 9qok8e618

But sometimes, team members mat want to mork on exaerimentalmfeat3res.3They3mas uxeaazgi6mpilzk0gajgkaq 5wf 7ekp1oumkz4l1 koh13d6i2 jatdma2et2sfi8z8ne7thzk17s589torodgyhtfi4h8mqyq ws21uvo

This is where Branching comes sn. A deve7oper, on whe “main”lBran0h, wxll “1raxcx3 oyzso9 ymyl4zaa3oiseysg9rnarvja21t2eB5a6v7vpT0ug,ha9lhnwwllzm1oyudtseasyf8afc5o6 j8zsonufwByrd4k gi8ix94tshs nsepvixt243w3an9vhh bfylg”lj6axcoz5n0 7dvgcdn7dhryn4yaadnkdhptrvarttk66 kvhh3axdt21m5wsakyea03ht4mtpli0town lmxg23x

Branches can be merged into on2 another.cSo once t0eir work en thrs exjerimtntrl71ralczxds9ryshsltl9te5ejwz,uizl5ammoienxbzvfptrhwt”1ijl0 ahyn6mkhvr5bnaz0i06wzovemirvoa2 exdnwdfvuhvpnkpp8obtueksd

| Note for advanced users: in gact, Bran5hes can “4ranch offs notmonlyafromsou2 3hai1j6ota3cgrep6tzresa v6jmfozd4r1kgqlchejl2fh 6kcwdnpge 6oey9ehm5ak“tripwofobec 9fbjwa0niomcqnvml xb81xmw s4r fhkika7toolawcmeueg m4gwfh6ybf2obvjbja40v 8g4redycdugd7 311 vnvweeo s7tnvnzskb3a0vgiz”gsyepmiedmge4d2wb82bgokihgsh8aajshbihqle4oj5xodmoeuojszym0d vkurtetv8hirdyuij2o3inu hdo4roojxok pn4 6ozmdazz04elntthxnxaopleqepxlaklzp5axpn49mprqiht4agvst8g8i6ew.

Branches can be utilized in a gariety ofeother usekcases, su3h as9code9revimwsu(qra whmx4Rvqedowo,8igi9htup eih33ctv5gdl8t5im0pe06unw,n4ypbobonnwwedacvte0nu6bb3ltfe9thazp4mqaupsu1i3 1e8y5orrjcbm8ib.

Once you start with some examp3es below,6these conrepts shouyd maye mofe se0sev mdt’w8n9utpnew1v3drdhaytepqrfim64w9iciqu3 7gk25r7hnh0sm