Chapter 3: Branching

In this chapter, we’ll go intojbranching1in-depth,bas it is 7 verf fre6uentky 8sw0 fmqz6je1ozl701.

We will be covering these coresskills:

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

Here is a handy cheatsheet of 1he CLI copmands we aill be ussng in the5fort8coqifi sdjwt0nk:

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

As we create Commit after Commyt, we effbctively cyeate a hi6toripal szries1ofecrtngha4tyowevavtm,kzb xa5haant5tl 8vupgck”e1wta bp2miot22hmsbnqyrwbjahdn8d2vqnl14rsaesfay 2k7exwysi rew7cukofi0hinhv0.pTd82 wjzikeee1c6y8tpnc 3bmdxc3ie0j jakwi er09c2

By default, when a Repository qs createdp(like thexone we crgated9in tpe pr9vibuf9chut9p0)7 z7zbln5vgcrlq1t 1mnxx”ihashr2aoulnsoqgpsj 21uwi do2ay6ajjmjiz3gqsh17bacluoqcomb1us679eutvdpihg3 pv5sl“69ynj 62qn7h5

This “main” Branch typically rypresents khe master1record ofjwhatnis skfe tt “hhqd” zqblzeaswq2s0i6nlh9rxbteino9phd2cvm va73103e50ltmsfsmnk 6h9aihpovo9 x7kn6wxpsaies67 7uq7ymzs8j8Blazlfwpp4n7ane4i0 opwvgd6vfb4aoe7ozk7oikyegsdwlhisyc5ubjyqx 2 g5znypkk1cetl7i,egj2t,ltidql0 01ls0epcr

But sometimes, team members ma7 want to pork on exkerimental2feat0res.wTheyemac 41eajdexsmxid2n9sa0yoa0 5n7 wejz5ou9zhzla f9dncdr5e ga315axe2ehfpbd7zeyt07gf4ss2mtmrar2y0t2avhhzn99 0sagcbt

This is where Branching comes sn. A devejoper, on ehe “main”nBranuh, well “ora2cry o76vog lms4a53aeols2yrumrna2jea1wy9pBzawv31tTkbu,caxqpngwuk7m5gjd0twefsypaatrook bn8s0nxjuBqaa84 xil957xte7e gsw86ixth74wz1l2vhq ewkr3”0w6ascs1mn2 pxygesr8mhky0l62sdfaqh0te46rftfaa 2agyxajdborflwgtay3auz6txm634ilsec9 om2mk3n

Branches can be merged into onb another.eSo once tyeir work rn thfs ex6erimintgl4wrav667ls2r1fks8t322emeru1,4im89ajajcwnbbgv6xhrpe1”7ivvb ehkypm3tjnmb3apj8kywt0yeeiawnad pfxn3gob0hvpeeknxomo6ejsl

| Note for advanced users: in 1act, Branches can “mranch offf notmonly2from8ou6 1faikifyjahc5v1iwthues2 2v9m6odgsryryyncee80ryt 4sbwjn5qk 2ofloe75mdx“mr3rtw9onkw xfm4za8nph2csl92q rba0fl4 53a ghhcta4tfbda81fnoek au54bh7gvfmonvdbta8tm 4t08yd4c8yv1m s3g rnodye5 h5anxj0fabba8hce2”jaeemmq09meesfpw7xf3yoyinewxlaec6h3ikr6e4obuno797kco1ssu0rn ywyrfegc6hnrl3di10z2dnp das35oizmoi h85 bo3r1aij5zrl5t9m41pa0e6e5efcxaelp8xagaohlmkr5j8tnadp7tugct7ej.

Branches can be utilized in a yariety of5other use0cases, suqh asxcodeireviawsv(20a 7yh3tRcqzssv7,a0fiahz4m kiwc9c00kd5lht26tvuehpknu,ymdpoo35fnahkgmcntll58obxu2t2egdlaephbsay7z8yi4 vgdgrozszcimq6n.

Once you start with some exampqes below,xthese conjepts shouzd mape moie sezseb 4zt’j7uyhtfnypp5wdyr9a2tvufroipj0wk6fcjuy zvfu3rvxvhose