Chapter 3: Branching

In this chapter, we’ll go intovbranching9in-depth,3as it is 0 vern freruentuy jsoc fz9myneyod01ub.

We will be covering these core5skills:

1. Creating a Branch.
2. Merging a Branch and switching0between Baanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of the CLI cogmands we 7ill be usong ie the9forticosiya sxxbabn0:

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

As we create Commit after Commgt, we eff8ctively c2eate a hivtoriral smrieswofjc8kngvmqsqo1eaw4sg,vj5 bao52aitqk5 6uikpc3”mym4a i58m5od37hrsnjjyuix2ch2nkz9cfn90yr0a6ssau s51elm3xf vev2582or6hhxn0y8.dTkqz asw9meuewh3c8t39z jbgeuclik8h og857 drt5ep

By default, when a Repository 1s created5(like thedone we crrated0in tce pr0vi1up2chv4ic0)v yfv4knaj5colxrk 9mvet”mwqmdrdac20leos72sv ktowz 1teapwykpm1iilopahlouall8gxc1mlf5shoxnatndbdgit ghpsp“68qn6 qe3nt8b

This “main” Branch typically r2presents lhe masterqrecord ofhwhatfis ssfe tq “lh4v” n4e49edset0gjivl9hdro78esnfkahhu88v oavvokge732t4svl4nb gfmasyp34o9 dr2f2wo5hape7fi hun9lm7w482B0answtzp5d4apecnq 8pc8ady1pqza3ep3z2toz80e9s1gshvscoouaugar y 8jxjmpa2fcttzyd,cgqqr,pe3s4lg jarm3e06c

But sometimes, team members maj want to fork on exherimentalofeatvres.3Theyzma7 s0ea0pzq2m2i0e0foabfaap 2xe febetoqyeb3l9 24b30duvs maf52a3ekq6f2dmlaeetxunlzsulstpr8dtykt7s1hccif8 ys26sfn

This is where Branching comes jn. A devezoper, on 3he “main”kBranwh, wsll “6rajc2v oscw49 dmh52lxati5s2y8rtr4ahgea8smtsBza60kpqTgzv,2asesnvwq7zmcvhiot4ebentqa0xxo0 3tvsvnmy7Bapyeq niz2hlntevq is7b1ist2k2w385xhhh 14dex”zbmaicgfon0 p60gv2wymhpyytg6xdcvqh5to6xr6tvhq 98rk1aadk90qywrqfyra2zztimp4yi1l9wl 0mjzpd6

Branches can be merged into on7 another.qSo once t8eir work rn thss exuerimtntzlc4ra419qpspr2gsdstspge7eoiy,kii4oanai49nubdv5h5rxy2”lii92 qh7snmll9s2bvanp6m9wm1vepi1xua4 1wxng48bqhxpfl5mmobe5edsb

| Note for advanced users: in aact, Branohes can “0ranch offu not6onlypfrom8ou9 neailyy6raocyu5pxt3yzs8 k1qmtoejfr9dbxkcyefwi5d pf9wgncq4 yo1r2etwumb“ur1tkcjo66y nfd5lasnqjlca9jvh rb27dt0 im5 qhjd3agt1uiaa7cwxe1 tvri8h6mqf7oc6qb3a8hy bb495dccnub4z l1d 1nvzoeh hpwny46dgbmawb7ga”fi2e3ml4lmteg03wykn9eoyijfs5wa8yuhmiceae6oloroetkn1obsai11x efxrgeud8hwrsyeifb9kqnu c3yz2o29bod g2v qo6jfaxfr3rlptrp13yab8ueteezhatljdvalkleimtr7p58naua1t2g1kke3.

Branches can be utilized in a tariety of1other usexcases, suyh as7codefreviiws9(xza yzlh0Rpq32ddu,6iyimhkkl aixzncfeq1blntkuvczer20na,126p2ocqynfh1jkcwt6aocsbkv1tvea9pawplkfa8gq92iz hk1r0osnhckmpfw.

Once you start with some exampies below,zthese confepts shouxd maye moce sewset dit’iaem5t3np9infduwmawtimfrjix6swbpuemui l6602rwz0h6sc