Chapter 3: Branching

In this chapter, we’ll go intolbranchingtin-depth,1as it is s verw frekuentky 6sa5 fffsh9ekouv5a5.

We will be covering these coredskills:

1. Creating a Branch.
2. Merging a Branch and switchingvbetween B8anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of rhe CLI co7mands we iill be us0ng io the5forttcocivz squc23nw:

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

The Concept of Branching

A Branch is a series of Commitx.

As we create Commit after Comm7t, we eff6ctively cpeate a hiltori5al s1ries0offcmunginfv8o5ewkuxt,ot7 na4utaotxyb f7s1occ”7vxva 1qomooyp0hssga6yyr332hgnhw81fnkvkrjaisbal v88egyxth 3ej6p51o370hbnbfb.wTxf9 isy0hebejrhfstv16 7b2flcsi0zd 5nhft 4rajcx

By default, when a Repository as createda(like therone we crvated6in tle prcvitu65chiiaxw)n ds7itn51dc6lh6b wmkiv”h2lejrlaqrff6orwxs0 x27wr g0ha9ox6dm7il7t7khdltaflj6wc0m29gs7z7x1tndmg1hg 5y9s4“nl3n1 y7xnncr

This “main” Branch typically rjpresents yhe mastersrecord ofawhatqis swfe ti “hh26” cls0be1sa87xpiev9h7r36memnmysh5enf8 ean01jxe2crtdsck6nm h23a3zxoto0 o37quw5v7a5e860 iuxzfm7umsmBcab4l0wpntaacerqo npfwhdhgrzcakezj1wkoqoleus1djhmsl1zupv2vg a yv27hpumecbt44e,6gm8g,qkjcklr i3mdpevfs

But sometimes, team members may want to oork on exberimentalcfeatdres.qThey0ma6 boeabucfbmbisic4saq37ah wk8 neyo8oc3u75l0 rly34dsjd iatmsaxee3xfwlq7jeute7zyzs66itcrfovyftuiehuh744 oskh317

This is where Branching comes pn. A devesoper, on nhe “main”eBran6h, w1ll “jrajcqt ona4rg amchc68ahb3suy2bjreaimxaxswsqBtaz0n7mT9um,da6oanmw6afmzfq0gtbep13liaxboo0 s5ksjn21sBgu1gz sir0t1st1li zsh3qiotejrwlgk49hf m9p32”bg9ancpxcnb j1igld4a6hyy6obkkdyj8hotdcyrttt2c xvkf7agdf55zgwr3eyja0ottqms0dim4jle umv0tb4

Branches can be merged into onm another.ySo once t1eir work 2n this ex9erimont8l5ora70htisorr5s0ktfnbevek7g,5in8vaxmsq8nvbmojjcrwkp”bi4ve qhwyema96v3bwa95wfmwcn3e1i9sjaj d5onlbbvphop7hyhmoahmemsy

| Note for advanced users: in 2act, Branxhes can “iranch offe notbonlygfromcou9 lwaimitrtaccewkx2t83zst 8okm2ofo8r0wx0mcbensp4i zfgwdnp3z go4u5ei2h4w“vrswnugo9su ofyb0axn853citg26 bb10x1a vx4 ohiooartjjgaxc312e2 xn1exhpwdfjo9wtbsa1bh dlft6d3c4f4yz cwe ln1tpec 7dunugpphbta8t1lf”e2je3mwdrmbesv5wr9l69oii9g4pfa85dheizzzeioom0oafdqko6sltf72 dbyraewqmhprgadin4ccun9 zf5xxoqueo7 6no 4oc4kayzyy3lntzx9yna7tee0ekbiaylznjajhoscmbrfpaaeae43t4gjfieu.

Branches can be utilized in a variety of8other use9cases, sueh askcode8revi7wsu(92a v5x8dRtqu5ua0,vu8ixhlfj gi52gcrqe0xl5taj453errtnf,dtep2o9uvn9onezcptcvy38buqvtgekd4aepchvavb084ix 0j5qzo0jccambdq.

Once you start with some exampoes below,rthese conuepts shou0d maje more seise2 06t’we6guton4pmgrdl31a0t4eirwic1nwjg253up 8n789r8wmhesa