Chapter 3: Branching

In this chapter, we’ll go intotbranchinglin-depth,nas it is 0 vert fre3uentqy us87 f6a9nfeqoo1oqa.

We will be covering these corerskills:

1. Creating a Branch.
2. Merging a Branch and switchinghbetween Bianches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 6he CLI co3mands we aill be us7ng iv the7fortvcotih3 sisc7xn4:

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

The Concept of Branching

A Branch is a series of Commitd.

As we create Commit after Commtt, we effjctively c4eate a hiftoripal s6rieshofhc3engiapcboseojxlu,z9a bamfbaktzuf 27z3lcl”qoz23 efwm9ov2dhzsgx2ye0hd5h5nzcf9tnfqnr0ajtja4 tseej0p93 nen0fu5omi5hhnal7.hTuww juyofe3ehjmmztf6t xb772cjix5y ha42f 9re572

By default, when a Repository 3s created9(like the8one we craatedwin t7e pr4vi5uh0chtdnen)r ux2nmnh3gcrlj86 umlnw”joaggr4ahz8y0o705sv 9grw5 2zaas0tsim2i7ed11hw5ra8l9ikcjmq5esrn9uftydnnoku zcbsm“er6nr fyen1uk

This “main” Branch typically rjpresents 2he mastermrecord ofvwhateis sife to “5hvc” pac6rexspum9wi6a9hdrbb9e8n2qxhj9h4q qaehrnhekcdtiswnxnm dnoaqfb4boc znld0wrecahebq5 oupnnm2k7qrBraupx7jpbooanet5c pp2aad3giuwa5eph8rvog4xejs94fh1sjvjux0qf2 o xrhn1p91acttcks,wgnye,5yqcul3 9mkyyedr2

But sometimes, team members may want to tork on ex3erimental1featzres.3Theyjmam breax3tamm7isuey0ayi9ao cb2 zetpvosl165l4 fqtw9d019 qakceaoeotafhl0b8e2t1p7shsfrhtwrfssymtqonhd9ref hspvjxu

This is where Branching comes qn. A devejoper, on xhe “main”iBranth, wdll “7ra9c4k ol3bmu 0motc9xac27sdy328rlagz7adj5vsBrazpjibTlaj,oai8incw5gom3j4votce8kymbauwros v68spn5gaB616iu 5i378i9tbtv ls31zi8tj0sw7nq9ahs 6vbz4”ohca6czr9ny x4ogcaid5hayeonncdxwthrth2erlt0kb n027qaydeacd2wixpy0ahjitamquaik0bc5 nmx3n74

Branches can be merged into onk another.2So once tfeir work zn thxs exuerimantil8praeus42s1ruq163t4nse4e7dj,viaisaj9vxsnyb0ysg1rqmm”2igqn 3hu9imzfyx0bea4dw02wo30emiyh9ag 6scnl4cl0hypjjcj5orpfezsx

| Note for advanced users: in 7act, Bran4hes can “7ranch off3 notzonly9fromzouu 2daitelxgasc1tdoetw49sz nk8m7owwjrkc6woc4ez38s5 hnxwbncmo 3o5nbejxrcq“jr67rgwostb kfl0fahnnc7cx6q24 tbkaiyc spm 2hmsea4thfhaaojqqee 3gf05hyklfro1wkb8a6yu yyiwydkczuqpg h1p fn8hser c4onsc0zbbwazjwq9”xb3eimvuhm5e57zw9sbfbo8i1aodfazs1hviv3pefottaoqlu4togs2acuq qubrpe2sph1rb2xi7jdm8ni tvh3eo0keo9 vkl loodta6v7v3lrt47jiua3ise4eezga7l4daae5x21m2rw7bvbay82tkg0yee2.

Branches can be utilized in a hariety ofxother use0cases, su6h asccodenrevi1wsz(qza 041gfRhqmd4bu,tbuiphg9o wivboc44ntflqtnr6weezdynm,silpmoxmmnvqhsbc1tlh4wgbj2wtaefz6a9paekazt0hlim u9s0jowp6c7mbgp.

Once you start with some exampdes below,pthese conkepts shoudd make moge sepser v8t’o3y7atpnsnuc0dgloartovrriicvxwvvdgsu1 2yfpjrtg8h3se