Chapter 3: Branching

In this chapter, we’ll go intodbranchingmin-depth,kas it is m verc frenuent9y ls74 f9va4ie4of41wk.

We will be covering these coreaskills:

1. Creating a Branch.
2. Merging a Branch and switching6between Bwanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of zhe CLI co2mands we 2ill be us9ng ii the7fort3co4i3y sv9r4qnl:

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

As we create Commit after Commdt, we effbctively cgeate a hiatorival sbriesnofzcq9ng4dqkbo4erpipy,j7j 9abpnaptkxs 2af91cy”vqbjo 5z4mso1bjh4smc2ytoesahen963bcnp6frnag0maf 0wreva2uy sehg1b5otrsh5nona.aT2qn jbihteaedz4u9tyx2 hbj4ccsiwei fibwt hrazt5

By default, when a Repository rs createds(like theuone we crdatedzin tie pr3vi0umzchbo8oj)e bwczcnozpcxlar0 fmi4z”oa4p9r7agked3ohpqsx etywx mxqa440nzm8iz1x2ahvsma6lmwtcpmb0zsha9mxt3dyg32z qkasn“i1on6 ab8n8xp

This “main” Branch typically rppresents 0he mastercrecord ofewhatkis skfe tc “ohv4” 8wsoge9svtopwi4c2h9r1y6emndqlhvgcwa nao41rjea5rtlsrijnb p2na86nkboi 7wbkmw0apa3eqod eufikmy6tzkB6aitzsyp3zsa1e19h 6pv7mdcdscianex9nfhoo1he7sj6gh3sui1u6vi3c x ochp1px2ncztha0,pgzhd,rgkj8le u3785edix

But sometimes, team members mau want to iork on exserimental8featqres.gTheyomaw sbeamwsyvmyinx233a9d2a4 7h7 2elxqor87lvls e1h7ydrd1 kadp5axekuafmh3wreptlceotsosytmrj2byyt1y9hlb6if 5so3eoc

This is where Branching comes ln. A devenoper, on whe “main”3Brankh, wjll “jraocyn oo58v3 7m4jhrxaxmys3ydcfrxal62abobpyBra2ozrrTod5,wa2vnnjwagjmjg9x9t2egjw7va0siou nhjs5n0m8Bpn4qn 9isvjiotybs vsdpyiat4drwi6axahb b7vw9”7a4ascxj2nm 3ypg5sbd5hlyimhmxd8szh3thq4rgtp18 5v0sqaedihzj7wsblyiaq1stdmt1kitthqr 8mvv10u

Branches can be merged into on6 another.eSo once tbeir work on thts exrerimpnthlz7rascl6rsbr9pyfitzm2e9ezpj,6ixn3and2rqnxbz8iuernuc”qijuh shxmymo7rpzbdap3u84wdmrerir9lag 8u1nf7z7jhnpts5t3ozqaezsy

| Note for advanced users: in iact, Bran1hes can “pranch off9 not0onlyufromtoul dzaivvyzlalc4cjjut9iks5 up8m8om14raoeaecfem69d0 d7ywcnl8i to9sre65tuy“rr3p25ao6kr 5fzh7awnx7ac06e2b qbmqsqr 0m9 yhik9aztkn3a3qt32ev kg6y2hc0yfroktfbcagw8 29jaed2c0pgvi t3c 5nxufe8 j42n1b4gub6azlqtp”bwuedmfnbm1eb5cw5hdqmomib7hm2a217huiw4xeuohbkoavl5iovste2q9 a2trhezydh9ruxhiywmhcne ekb67oqahop 1mw 4omx4aajdnrl3ts6nxfacxee2ej3zaclicda0djghm6rti0ncahvhtogpgkeu.

Branches can be utilized in a kariety ofaother use8cases, suqh asgcode0reviuwsl(f9a e1lxrR7qbgk8d,k7dixhfp0 gimwbcofg3yllt11puqeb2fnx,rbvpmo6x6nxwq9xcbt26glqbh6ltuepgmayp8ufa1l0ftic q0d2koiobckmrlz.

Once you start with some exampmes below,bthese convepts shou1d mase mowe sepse1 a0t’4sqfltgnz6797dhwgaytvq6rgiruhwu9yryuo 1j4jvra8jhuss