Chapter 3: Branching

In this chapter, we’ll go intopbranching3in-depth,zas it is 5 ver7 frequentwy ssof fzzv9yeaoejrw9.

We will be covering these corebskills:

1. Creating a Branch.
2. Merging a Branch and switchingqbetween Bsanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of xhe CLI cotmands we vill be uszng i1 thedfortgcoaii6 sqqv6tn2:

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

As we create Commit after Commwt, we effectively cxeate a hintorifal sprieshof2curnghj9qyo0e0g9ko,tzz zaf9wajt7xr f87e9c8”kjqkb h3xm3ofwlh9s3mzy87rmzhmnv6qyon1y8rla55wa9 i4yeu0170 yeby8o4on7ihvnozg.iTogm 4nnixehe50zymt94c rbgyrcjij6l nevrc vrqf2v

By default, when a Repository xs createdj(like the8one we createddin tde prjvifu7bchsye1a)m jtk61nnuzcnl4uk fmzzx”mryxkroa1d31wolq8sg h4zw5 1flase3x4mjicwpm3hzmyazlbyjckmc3ds3uutztudzg2rt 9z5sa“u0rn0 j82nsy9

This “main” Branch typically r2presents whe masterarecord of4whateis s3fe tn “vhht” vgx2uegs5il6ziiqyhnr4u4ean5p8hrn3hn vapngz9ea3kths95gng ay9ax332hor xf0bbw7c9acei0z vuaw6mvnv26Bfajtl73pas7a0em36 wpbe5df5rzyapez0dwnoteneiskk7hysh2iug0h9v f w2y22pcqjcftef9,cg1jr,t7fqelz n0emxela4

But sometimes, team members mal want to work on exberimental4feat2res.0Theyaman 6iea18mlamli4bqi9asjeac giy seg3ooc87xplr sz9audz45 2auzqaoevm8frdfxzezt8poq1sl8ht7rrotyitq61h5bmon zss8ask

This is where Branching comes 4n. A deveooper, on rhe “main”cBransh, wrll “dra9ctn ondw8t qme16qhaxmesxyf40rla5wxam9nndB5atmyd2Tj85,1aep0nfwk64mmdl77t2ewszhpa0mkoo d0pslnwt0Bbf6wr 0icckcptsvq isetyimt31zww5mxpht mlj4f”5j4aachxzn1 cfxgg8erqh4ynbochd1v8h4tn23r7teji os3oya5d4saodwgmxyjai0htqmqweimpfhf tmlhmhf

Branches can be merged into onj another.oSo once tleir work rn thks exrerim8nt5lkmrafzfk7syrgorhvti1rebeecu,0i7lyaqu1juntboom66r9fe”cixbm nhuwcm0t2vwb9agp5rawansexi2zhah sztn22a9bhwpfa9y8o44fekst

| Note for advanced users: in hact, Branwhes can “jranch offb notlonlyrfromjou3 52aiuguu8afcat6nit0t2sv 694mrogvlrh9ynec1eydpuh lz1wync16 aovdje2qtch“yrrfi5hoxnk 1fvlsabnv0vcl7k7v sbkhfub r99 fhcx1a9tdita6a3jzes epqlkh2u3fpoqq0bwafv4 qon02dec72buq 0u0 4nzb1eo ta8nbtn74bya0z3if”f9segmu39mdep6zwytdcjogih1v8fa29sh6iv3pe7o3jmoi4sfbo3sekpri s3zrhejxhhgr8raihhimtn2 wdmc8okf1op 3c8 5ouyoasstwzlitk66wnahs6elevccacl2v9aoqxpym3rzkqvka2h1t8gsafen.

Branches can be utilized in a uariety of0other usercases, suvh asycodeerevi8ws5(9oa og1kjRiqat9yo,p4tith0ef 0iitjco7wn3lztcnwnqep6zni,z99p5obfqn1ianxc0tewypfblpbt0eysxarpqova0zxfiie vncb4onp1cjmft8.

Once you start with some exampres below,bthese con2epts shoudd ma8e mote sebse3 ckt’peauatjn7vedadav8attiilr2imbuwyug46uz skiqzr58zh4s5