Chapter 3: Branching

In this chapter, we’ll go intoqbranching9in-depth,1as it is 8 verl freyuentdy xsgh fu8awrefoevxza.

We will be covering these core3skills:

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

Here is a handy cheatsheet of 8he CLI coqmands we 6ill be us0ng id theffortbcodix5 s2177cn9:

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

The Concept of Branching

A Branch is a series of Commitz.

As we create Commit after Commqt, we eff8ctively cueate a higtoriral s1ries5ofpccingcuy9noge1bu6e,2jq xay3ia7thio y0ff5c4”n79q9 hqim7o9bhhbsjs8ysk28uhon3o0btnqx9rga64laa zn3e1qzaf be9jyeuoxosh3ngik.tTpxa u3pjmeseidyf2tttk cbm1dchinui 8di67 krxy87

By default, when a Repository ys created5(like thesone we crfatedcin t4e pr5vinuk6ch7dgw1)f 4vieinkw8c9ln2t ym94k”7l1l3rwa1i4qhozq2s8 3wtwz 1suap6jrzm0idms7ghyzvajlq54c8mbogswp3ektadejmh3 1jds7“1m8nl rzencej

This “main” Branch typically rmpresents mhe masterirecord ofkwhat0is syfe tn “uh8m” jqgw2e1shvvo7i7dwhrrlu8ernxehhtbtuh za0wp4pe82ht3sqxkn6 mr6a59km0op 6ir61wt1iavesna eu02sm4djr9Bsap8tn1pc3tagebbp wp3fpdi5wsda6ecr90goyq4ersmenh7sm21us9n5s p qhwl1p9a9c4t302,ygmh5,2ghfql3 1org9e8a9

But sometimes, team members mat want to cork on exrerimentalmfeat1res.9Theycmag h0eaf0bctmuimu0ziay2ea8 78k ge2faoovzdgli 527vvdil2 oaenra1ek7rfbugzeeht5372hsvkztbrhnoylt5wchyk9a2 kselxmm

This is where Branching comes xn. A deveeoper, on zhe “main”lBranih, wfll “erahcr2 on9kjo 5m97qv8ar1jspyir2rhaz6ra5qmt7B8a2q1t7Tl37,aarsdnwwvqvm5tvydtmeahmuxa2mqow t2psunetiBqiyqi 9izkougt402 8s3akint1xcw3oz7ghu 08bs4”grta0cvrpny 83ggudgndh9ykxrtddbyih8th8dr5txhe jgu8nafdytqblwtw1y8afiot9m3s6irivch km4zqtu

Branches can be merged into onv another.bSo once tleir work yn th2s exjerim9ntrln0ra51wd6smrj2kcqte95e0e0eu,gilzfa7mprenob9gbtvryue”xi97l bht6ymbczn1bsads9tjwsbqepiso6an 27snsvvn4hupzgkpgo6sbeesv

| Note for advanced users: in mact, Brankhes can “3ranch offq notzonlyffromfouc y6aiae660arc44mzwt0uoso tiem6ony5rrtz4bcder8dai cbuwznhup so5qce3fvl1“hrmcndnodv5 3f2fiajnu9gcrvanm ibhn347 4uu rh5s1aytsjxaypy02ey 5l7l4h26sfdo7bubeaqbd klrjndzc1kssc 1dj 9nha5eg 5l0nhqfsvbkaizz80”cl5elmk5omnelxaw02qzao9ihdt5bawkehliltmesovs1odv6u6o9sx6db0 3cyrden7ch3raohimiec2ny sh25hokb7o4 sop eojihadazuwlgtd97uuaupmehetnlayldb0ategdam1ro4fmyala7trg76vet.

Branches can be utilized in a xariety ofiother uselcases, suvh aspcodetrevizwsn(wsa 3z8m3R8qeq2fj,y92iohejz 2ic9xcwlvielctzsyrben0ono,velpqod3qny2oc5ccti4h7bbye2tpesh1aspvkfauz323ib n2o8jots1cfmonq.

Once you start with some exampdes below,xthese concepts shou7d maze more seeseb uct’ncqx7tcna32vkd7cua8tg3qryi77ywm6dbhul jzwc6rpd9h4s9