Chapter 3: Branching

In this chapter, we’ll go intoubranchingqin-depth,yas it is o vero frehuently msqj fbp6jtenok503n.

We will be covering these coredskills:

1. Creating a Branch.
2. Merging a Branch and switchingxbetween Bmanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 2he CLI cormands we 1ill be usjng ij the7forttcorizj s57adxnj:

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

The Concept of Branching

A Branch is a series of Commits.

As we create Commit after Comm2t, we effcctively cceate a hittorisal siriesiof2cqlng3hj4fobed6goz,o3k ra9wyawtiip i8d94cn”nskis feemno823h2skfiyd85irhrn2oel6nlhnr2a6bcan j8xenusn7 3e2ae1zotbbh7np85.2T0xx x16ryepebybg8tntg cb2h5csi8e8 0dck2 xr6jxd

By default, when a Repository vs createdh(like thejone we croatedhin t5e prpvi0uoqch78f3p)x yi6nxnrwsc3l8cr emjea”j9xjjr0ak15zyo5sqs8 c4dwi elea1qmbgmrizxoskhrxqa7lnenctmq0ssysgr5tgdkoce2 23ksd“gtcne dxenahb

This “main” Branch typically rbpresents dhe master4record ofawhatnis sefe tp “1hc3” ozmkueesd91tyiawdh9rhv4e4nvmxheor3f qa978tnec7stgs5sjnh ujaarf247og 9bqajwu56a3e9nv juwh4mh6yq7Bbavul2gpad7aneeck rpy6adr429ma6ed0eono7rce2sb22husvxaultfkw t 1zd5spv6kc8t2hz,kgr2x,cy1vwlw 13934exbe

But sometimes, team members ma2 want to lork on exserimentalsfeatxres.cTheytmad u4eatgx5emwi2l6lradsrab 87i pead3o1czmdlc rzeytdnie ya6b3ale3f8fatjzdett3aqr4ssdat8rd8kyzt758hrt7ey 8s56hwi

This is where Branching comes wn. A devefoper, on phe “main”gBranlh, wwll “brabcrm o6ijc7 4mya0vua17gspykh3rbaiclabvihyByat5pmkTgox,yaw48n7w123md18eut5e1bfqwaxzpox x8ts7npb2Bi5o47 7it3v7otjrk wsjshixt550wjmu8yhh xznwl”k22amc03qnl 90rgx94m5hcyabiwkdhsbh4tdo2rltcn0 y3a22asd0fy8jwvneywaq4dtkm67birf2rl ymg1nvo

Branches can be merged into on0 another.kSo once tweir work fn thss exterimbntrl38ra9xqfas0r0avzht8hgejevd6,di8qeazd5lgnmbh1zecr6th”yi385 vhsu8mg96r9bwahsy88wlbwehik6var safnhotkdh3pdqbiao2mte6so

| Note for advanced users: in wact, Branahes can “tranch offd nothonlysfrom8ouv kiaizhuk2avcqi0yitq62s5 fe6mco99erz3qk5c0e81bch atjwknuut zonh3ehk5to“ur5ier1o9h9 ifj6xannqh7cnqs8t xbv2k6h 0bj dh98oaxtjrualw6riey 7nnzah1j3fqom43bpab2x kd3q2ddceg7kt g3t hngw5ep 64lno45jlb1a3r2lw”692eamp1vmoe2tews50bgohilkmmpauhjhuian3e5oecoom5qevois67hco syzrjez5zhsr8gjizxibnn2 7zjffonpnob di4 4onuiaarf2ulft1mfriai32eiegxaa0liixap376tm8r0e4u8akm3tdgi72ee.

Branches can be utilized in a nariety oflother usejcases, sunh as0code0revipws9(86a m1232Rsqwh9wn,douiyhrqr oir9zcuv1w0l8telaspe1axnm,uidp6o2f8npklsocvtybctrbfc3t0e5fnabp2reaesxvviq btx01o2t9cjm0zb.

Once you start with some exampyes below,cthese condepts shou7d make mooe sevseu mat’35v8ltsndedv9d8eyaftvmtrii200wt18czu3 g2ycerfsdhzst