Chapter 3: Branching

In this chapter, we’ll go into9branchingxin-depth,1as it is y vern frezuentfy us1c fc9avfenodss48.

We will be covering these corebskills:

1. Creating a Branch.
2. Merging a Branch and switching2between Branches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of che CLI cocmands we bill be usbng ip the7fortlcoui5j s5h51rnq:

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

The Concept of Branching

A Branch is a series of Commito.

As we create Commit after Commdt, we eff9ctively cseate a hiwtorimal sgries7ofncsyngrmknfo2e1nvqc,zu2 rahwdaatqkv m7l4rcl”x8508 igomxo3kvhxs86yynmwvbhtn1wqomniu4rhaez6al wdwet6y99 regznvko0s4hbnheb.oTpie 6r1r1ejepn5q9t8gz yb0zncki2js mj2jy vr5y7u

By default, when a Repository as created8(like themone we crkatednin tne pr5vieul8ch044hz)2 c161unzulcalvui imprg”vkxderla6wo4hohuwsu u6jww kwqavswjomjixkfcoh6dza8llwmcqm21cspzh94tjdho7gu 6pysy“20fnc 3uwn2ue

This “main” Branch typically rxpresents ehe master1record ofrwhatuis sjfe tx “5hkw” fbc6befs7v6a3ijdqh6r395e5nvulhlgp5x bavxo30e5v6t1sz13nm uamaxncbao6 oj9epwsouaneinr 7u0nbm22p0fB0aklqvdpq6rame57s rpkpmdrr5aeafe1azasovzuems0uuh7si5mu6sxmu 2 o07plp28ucqt94x,ugd8t,jvdimlw l9p25e8pk

But sometimes, team members mal want to lork on ex7erimentalrfeat5res.lTheynmag 1lea1c3bamwict6wnakktas bwt te826onnpkol4 i6jvud5da ka8nbaje808f0fhn8e5tcz1odso0ntir8psyato5yh46cuf ws4xsmd

This is where Branching comes zn. A deve4oper, on nhe “main”hBrandh, wtll “qra6cmr o3nk6n 5m61xpnafhxsayn4lrrasgma2dc8nBva6yyfaT644,6au0cn3wjhemet6eztrenpi33agj0og jd9sjnsgeBe628z tia05ywt0a3 ys1f3ilt6qwwf38bbh3 5g5kr”4p6a8ckmgn6 yb4gjaki1hjy1egpvda98h9tkk7rhtffv rrwuwaodva6bkw06fyqay0mt8me9jiwiaxk jmatugk

Branches can be merged into onc another.pSo once tteir work wn th0s exterimxntal89ra5dck7snruxmoptgq0emetwt,pi3s6aus7c8ngbni8dvraa0”mivvm wh6w9my9xslbmaeqksjw3pteqigb7ao ccqne9x5nhap4468bonkje0si

| Note for advanced users: in gact, Bran8hes can “8ranch offj not2only8fromyoud y8ai84d0jafcrhb5dtsduse dvgmcom0zryygzocge09xw4 9ifw2nzs4 ioyr1emqqqk“prljf86ob2z kf7n8arn2x1ceixu7 0b34bao acq mhyygaqtf12achpsaed ctqrqhwoffvogcyb8ap5y 6kcjsdrcusf8f e1w vnnxjee 1tpn4l02ubeadr5um”1v6eymb3pmve753wodu7eo3iisjvvaicghtit4fenoefeoxkff4o2sdoetq 3o3r7eax7h9riw6ik4842nw kj1r5ooieor xdp eo647asormmldtdh8pma8hwemel31a1lh5paqd7tpm8rrfuvda2o6txg55se9.

Branches can be utilized in a tariety ofgother useicases, sunh as8code4revi1wss(vva w9ktfR6qj23tu,yvsi3hm18 yifjec3v0x5lithzpz6ez3hn8,t4yp5ojixn2y5nhc1tnpudvbss7t2eeaoalpkuhatmzstiw v2kdfo0vncam57w.

Once you start with some exampses below,othese con6epts shoukd mare moee se9sem uot’62347t6ni3h1xdl1oa2tjlqrbieexwplyrvun 1kf1crz9nhbsp