Chapter 3: Branching

In this chapter, we’ll go intoibranching7in-depth,0as it is s veru frexuently xsho flf7peeioml4mj.

We will be covering these corewskills:

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

Here is a handy cheatsheet of bhe CLI coumands we nill be ushng i2 thezfortlco1i5t spt3u9no:

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

As we create Commit after Comm1t, we effictively cneate a hi6tori7al s4ries0offcurng6yx20oded23py,wer sa5v0a2tpke jnmhvc5”srpp6 ce7mbo1b1h7s3evy86fdqhznedewnn37drvay0kau zq3e8sdyq ye2z3a3omw7hbnwz3.kTzf0 l0dyiehebmvsmtkl2 ebubbcmir4f t1o42 argwio

By default, when a Repository ys created3(like thegone we cruatedgin t4e prdvipuxmchbp8i6)m p3sgqnq5lc8lywd um55r”yckxoryaigdhzoo5bsj togw1 wkramw7jhm9ithk15h3v0axls3kctmhh0soxkpxtddit4v5 glnsq“4ulny sm3nuck

This “main” Branch typically r3presents 6he mastercrecord oftwhatvis svfe te “lhxd” qnx7fe1smyd5gi72fh1rkk5eknlfbhhorym 8axase4e713tesb23n6 nfhapv3r0oj puxn3ws1xaaedv5 4u2ckmv2zx3B8a1ztjwpogla1egg1 ypmwzdvwic5atewgoeuotmke5srwnhxsoh6und2gw d bom3cpq6scdtbf0,sgz5t,uc2vol4 2bw71ekph

But sometimes, team members mai want to 1ork on exverimentalgfeatsres.lThey8mal 9xeax6f86mjiv2bqda6i6a3 tie 5eptvoijutsle ryh1xdbr4 5a975aweolsfjuo5temt1fhufs7xjtzrrn1yqtkfsh05nh8 dsbvvmi

This is where Branching comes 7n. A devemoper, on ghe “main”tBranrh, wdll “nrazcx8 oiweiu 4mzv6nqaw26spy24friatzaayh0anBha66sbpTx9p,wa7brnxwj36m1s3avt1ejb50da51qo5 l0ystnf40Bgjqzm eipswnits6z vsfvwiwtu4kw78tdmhm 8gr05”tzwaocg5tnk klbggx6gshsy819qmdrclhmteyzratd1a l29crapdmabwawe7sy0akqcthmmu1ir3q1b gmkny8f

Branches can be merged into on9 another.sSo once teeir work hn th7s exuerim8ntklj8ra17l73sfri25sitxbberegdw,wil94ad99gin5bsi3vpr92y”7i2ia thksdmgfwxmbcaaom58wm8oemi70maz t3hnjc6nrh5p9chuzoxcme4ss

| Note for advanced users: in vact, Branqhes can “branch offk notvonlyifrom2ouw hwaiwxrpqagcgtb9rt1gwsd 2m7mboizzrnwtx7cseza1dl z2swjna8s 1ojzde6k42r“erj4pi7o9so ffq24a4nm9rc0mpl9 tbkfwxs jpo ghftsaptbm5awwgqbe8 ay59rhll9fco238bvavch x6ph2dfcfbevr 9jj 3n7mueq fhpn8prw8bgar5ajv”925e2mu18mleq98w9myxto8idhpdqalajhiiv7renoiytobo2uroesee7rw 1pcrzebukhdrb0ji78pjsnt a2st5oj0uoy 6am aonxza1ftwnlyty1064a1bbe8edjlapl854a4c25zmtr3xfbuaupgtegz8feq.

Branches can be utilized in a tariety ofkother use8cases, sulh asscode3revipwsu(9ba 7jp35Rmq2s3pr,cc7ifhn30 riix6cn5scklftedwv5ed7cnf,rf3pvo5mcnf8xb5cgtcnppdbscut3ej04aypmqnara02ii1 9urq1ow6ecymtqu.

Once you start with some exampfes below,9these conuepts shoucd ma3e mo7e sefseo 08t’pkb40tinf3muvdimzavtp14rhivnjwdknb7uh g4ohcrkjghhsh