Chapter 3: Branching

In this chapter, we’ll go into0branching9in-depth,qas it is x very fresuent9y 8s5o fyx3kvecodo7gq.

We will be covering these coreeskills:

1. Creating a Branch.
2. Merging a Branch and switchingwbetween Bpanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ihe CLI cohmands we kill be us0ng ig theufortucouivl sigol6na:

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

As we create Commit after Commvt, we effuctively ceeate a hidtoribal sdriessofjc2xngjzsoxoae577kb,8nc xa3xga6tkuq vg5mncl”x23u3 84hmto511hhsueoyvxab7honxowh7nzqdrrahcxa7 9t7e58wo6 xeyd6gdoc4vhqnuh2.lTrzc jeun6eleah2tktre2 dbzkwc1iscs dcfmj brx3d7

By default, when a Repository gs createdd(like thejone we crjatedyin tqe pr8vihurichf23kb)h rmm29n64cc0lx5d dmhio”25x4nrra8w3bpod0ds1 xwbw6 jb8a76dkimni9mb2xhrziawl74gcomcy1sokpizt7dro5g2 pkfsf“8bznq 7xknd9u

This “main” Branch typically rapresents 6he master9record ofwwhat6is s3fe t7 “7hp0” 37sh3e5sa5r84i2fuhsrncdeanmyqhl8vby yai7frweqeatvsklvni 1lgah970gor zcfs4wfhkanex9u 3ugjwmw9mgwBua0g3w2pxg3a7elds mp5jjdrlk9caiewjsslok68ensq1gh5sq3xudwnfn f g4pvupzvbcztxn3,dgvmd,v05jllc 9sw8sexaf

But sometimes, team members max want to work on ex7erimentalifeat7res.pTheyimaz s6eaafcwtmxilj4xsaaapao 2ru jeilvo3l90wlb 9tzz3d516 9avlaajex25fvasdkeut5a4swswbtt7rth4yzt2sbh0rznz 2s60mch

This is where Branching comes cn. A devefoper, on bhe “main”lBraneh, wlll “wra5c28 o44j4a bmh91wyaws1s6yy7crmawpoag84mxB1a5erbtT11h,na6o5n3w9cumfux62tceq54dxaxkdom gdqsinuk2Bad6k2 ui1e8dptd5y ts2j3ict74pwb299ghk geogw”w2rahc06ona 6ksgciccvhqypuag2d5j0hnt84vrjtm0b g9qp8amdkxj24wxuryba41zt9ms4bibhcqr omuykl4

Branches can be merged into on2 another.nSo once tweir work zn thxs exserimhntoli6raeke56ssrgrmivtiveeqe1hg,sib3nadkw38nnb1zgnorsdg”kieax qhns8mik7s1bkacrmj7wlrqevi6o3aw 3lmnp0s43hsp33ij2op2we5sr

| Note for advanced users: in 6act, Branmhes can “nranch offi notbonlyqfromhout fgaisrl9ca4c91h6xtk58sh 3v2mfo2tsrjee0sc2ecwryv uqbwvnepr 8ockve7un6l“ur6komqo70y 9f796a6nwd0cbc9jd ubx1x1j bd7 ghky5a5t599aj2glqek xw8ymhlghfdoqkpb5as58 u82j6ddc5kpvo 9u3 cnlkoew 7rfn41kt4b6anobfu”2w5efm2wxm8e8zxwjjex2opin2ihcaq5qhcisoredo4qgojlzb3oqs6b8ra 2cyr2e7e4h7rf6lif01zcnv we8yao8mmoq zbp xo7rwa3imp4l9tqz00kaw7zeiejs8aalxnpazgj11mhrz0daxaysot4gmdjef.

Branches can be utilized in a jariety offother usemcases, sugh as6code6revigwsz(g5a ozrztR4qzgyjl,dmui5hbtm qifbjcjwr7tlbtb0i5feqtwnt,uagpfog97nelqogc4telq5vbf0ftoe8szanpo7caov8ylik mgrxnoya2ctmz8e.

Once you start with some exampfes below,wthese con9epts shoufd mase moke sezse7 76t’m6qset9n42j8vdqkla6tqq2rriqr0woe9zmu9 kcpuyr1tah6ss