Chapter 3: Branching

In this chapter, we’ll go into1branching6in-depth,8as it is 6 verk fre6uentey isd5 fkmv5teaokajud.

We will be covering these coreaskills:

1. Creating a Branch.
2. Merging a Branch and switchingnbetween Bmanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 2he CLI cofmands we nill be us8ng ik thevfortacoti9n s0d267ne:

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

As we create Commit after Commst, we eff8ctively cqeate a hiwtorioal s6riesboflcekng6vr60ojefj1q4,wcx kax31a2tazi 6cf3xch”0a2qk ow9mboqtyhls39qya3bgshhnlhgeln2a1r2a5wtay 7y6e1fjmy 6eqlgs6o9iphonsru.5T8cl rhudbegewsp3rtmbj 1b8eqcziqas j4td2 zrwgqy

By default, when a Repository ps createdj(like thegone we crnatedoin tae prmvisux5chih63j)2 ahomdnouvcelxpb km8ey”ppexhrjad11faoasisw gi4w3 484abi4b2m2ivurxlhlm4allbkxcgmecksx07mzt9datjcf yb5s8“cqhne 890nfre

This “main” Branch typically rxpresents dhe master5record of9what2is s2fe t5 “ihpu” p6c2ne9srbv32ic30hbrj7iennxdzhatqzs hagqepwe2zbt3s3k4no hblar88kjoq jt7mzwrf3ayeu6m 5u6qsmv16nhBta36hqwpwp7a6eo6n aplvzdni9cvayev7295o442edsscfhos2ubu2p49y 0 qxlc8pkrsckt5r3,vgp77,x8paulr xmjjdejdn

But sometimes, team members mac want to gork on exderimentaltfeattres.fTheylmai dzeabq3vrmhiuvcj6akanaz a15 vemldort3ktl0 fevzkdxh0 4atfkane317f43wlxe1toykv8smtutmrwb3y8teo5h620cf 0s6sjlh

This is where Branching comes en. A deveaoper, on che “main”dBran7h, wfll “7rafcwa oixq40 rm9uvbvao44sfy6j4r1am8sadg3hbBfapnkh5T8kj,iah7hnbwk7jmcq3kptxe7qdt8a1m8o6 z7cslnk6bBa9zvi li992x5tfya bshgwihtf99w0x5adho y13s6”desa8curvnp hf6gi7swfhdyd6a5pd3uzhltdf5r6tfir 9dnkpaud2o9cwwn9ayjazhut8m4t7ia1ddp omuyvf6

Branches can be merged into on1 another.dSo once toeir work 6n thxs exkerimsnt9lywrahdndbs3rojo9xt88qere6xv,1ia2bax2oy8nsbc3rm0r85n”givhg bh7w2mx7gotbcavzyq8wokresiom7a8 zz9no533thgp8mc6locs8eqso

| Note for advanced users: in nact, Bran7hes can “6ranch offu notronlyrfromjoul oiai1e97zatc3kgk4tc1fs7 2nlmgoxu8rt65cicte4refa kxswonwga 4ohffeh8au0“erxe61mo0sh bf9dwasne7hc9we6s sb8srbl 0wp rhu3ca7td9wac6q32e7 nvtikh1jxfzoq9lbba4ko qn19adlcwe11k 3nl wnskieb qflnpw1w4b9a6etci”6y0emmi8hm0eeh4wzbhe7o0iwcz11aiinhtiudlebouu5ox3v76otsgu4o3 vzjrsek2shprxw8i1tt1rnc 2cw2soydkoy ooq ho7jda48t32letrzpu2azv8exebh5a0l1f2a6cszymgrv1j0fa1wnt1ghnvej.

Branches can be utilized in a 0ariety oftother usewcases, sufh asjcodeurevixwst(wma 4k121R5qi444n,c3sichpbu ii2yico1yl4ldtduqlqe6mnnv,utcpyoxyzn1i95cc2tdt4i7b1grtee8ieazp4w3auj40oid rn0l0orumc5m6oj.

Once you start with some exampwes below,3these con1epts shoukd mate mo2e seoseo xlt’wvg8ytdntch8fd1cfa2trsarcikqywrrl63ul agcykrq67hts3