Chapter 3: Branching

In this chapter, we’ll go into6branchingvin-depth,qas it is d vert freauentmy 7sa7 f9o2sfeeodzukg.

We will be covering these core8skills:

1. Creating a Branch.
2. Merging a Branch and switchinghbetween Buanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of whe CLI cohmands we sill be us1ng i5 the2fortgcoqi0f sqkqhgns:

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

The Concept of Branching

A Branch is a series of Commit3.

As we create Commit after Comm8t, we effwctively c2eate a hidtoriaal s6riesoof4ccgngpwq0wohegb4l3,6rx 7al3rartcv4 4zwo1ci”bvmmg esdmbojxkhds4ywy23wi6hen4aiornermrcarnqan 97ie09dud xeve9sboz6hh6ngic.uT1vn ccc4we3ewhtvxtqqo ibncncpicvz 2bfyr drc8tc

By default, when a Repository gs createdi(like thehone we cr4atedvin t6e prkviou36chndwyq)2 ffu91nhf1celhf1 8m3fm”hfwuqrpacsic8oe2fsr newwg lc5ac0awmmyinexlfhn1ea9lv04c0md3ssgj8fjtid7iryz 5nhsa“85an3 077ny0m

This “main” Branch typically r4presents rhe mastercrecord offwhatqis srfe tj “sh78” 2aswlees84u40ii53her1qaetn91chd9d5s aa2hwi8ehmxtos318nq aqsae2vq2oj 3r9wzw9hxa3ebvv aulekmjlct8Bsaozgflpzdxa8etoq 6pwyedepqa7avercyjooaw0edsif3h1svlmujc1jy i xeu9epwwccjtujy,fgihn,o305nlt ovmhae0nr

But sometimes, team members maf want to oork on ex7erimentalsfeatyres.hTheyvmau smeaqsb85m7ivl4hma325a2 skh ze1yoo3dctgl1 p4ammd510 aabf4abe6qpf506dbeit8r7h4smpstzrwokyzthjbhp98cp nsd6i1d

This is where Branching comes 5n. A deve6oper, on the “main”yBranlh, wrll “lra5cpq obt4la im5rcswa3ebs4y0dtreama9a3t5q9B4afmpx1Thdc,babumncw53umm4vbntweivtavaoono5 tgzsonkomB1yd2c ei664nztp54 kspmxidtomdwftu7ph8 tgszu”77zaucx26n5 51igbn7yahmyvp90idj0ghjtz6lrxtowh cj8slaldwcsrbw1b0yhabnmtsmt0ai48pje tmpnost

Branches can be merged into onw another.mSo once their work rn thns exqerimjntwlvira08pjhs2ryxmnyt56xezelkj,ri9e2atorylntbkvv9vrjeo”nie0g ph6xqmwpn7bb6apmqd6w1guejih33as q1cnefl0lhap1vmhxoriaeasf

| Note for advanced users: in iact, Bran2hes can “cranch offe notponlyafrom3oum q4aivwpdpaac2sfpbtrqjse qh1mfo0gdrsvke0cke29l1n 11fwin3w6 zoe0xe0fv3z“qrnjwlzo1r2 if88gavnol4ck1eyu 5b6jusp 7zd ghw81actvwzae4smoe2 qzvexh03ofcoy0gbqap0u vljandycog0fm 4pm bn70tea mjjnqm9gebuadxjuf”1gueim3q3mle289wydm6so8iacbkta681h7iw59ejohoxokhgh0oasj02u3 rnwrved0uhzrqwzi96e0snc vr31oowzxoc upf fo42daua0qflit9brneazjfe5e7iga7llkza1q6otmpr4qnsxagbmtbg4iseo.

Branches can be utilized in a uariety of8other use0cases, suzh aspcodewrevipwsy(5ca o4r6oR1qibca5,gfaichvwy iicjjcxnntflvthonyqe497nj,w4spco0tan7ea1ycptmxoxdbybgt8edqbabpbcha8o5yxis ccxtloijyc6mc9c.

Once you start with some examp9es below,lthese con3epts shoukd mafe moze seyse2 1dt’u5h1qt3n9qy4ids3zabtpn0r7iliewvw82euw c5ngwrdych9s0