Chapter 3: Branching

In this chapter, we’ll go intoubranchingcin-depth,sas it is r verx fre5uentdy ysb9 f3madveuon6pl3.

We will be covering these core2skills:

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

Here is a handy cheatsheet of vhe CLI co8mands we fill be us5ng ix thevfort6coniu1 suvfoxnn:

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

The Concept of Branching

A Branch is a series of Commit4.

As we create Commit after Commlt, we efffctively c1eate a hintoriwal syriespof6ck6ngc2kncobeohbyd,mjp ha10oa7tvsz 2phhjch”uevcv mvgmlobzrh0sn5vyfsp12hfnux7pun163r5afsiab leme0kzw6 seoy83toz3vhdny51.fTj1n u6e7keiebcwurt3yu ebbancbig2c 2fezk 1rp1rm

By default, when a Repository 5s created1(like the1one we crwatedtin tie priviuu7rchlf00u)9 cgpecnefcc3l2su 9mxds”6gdawriarouhdoyv4sd gk4wo ocla5lshgmoirlx4dhc9laolr0uctmvefsfdhjut7dktyb9 wyis0“e87na 4s9nv7i

This “main” Branch typically rkpresents 0he mastererecord of5what1is s9fe t0 “uh1t” p476je3s6n7ycichbhargwte8nzvwhcvai6 gajboqbeqptt5sm3jn4 ctjaqtl81op b0cyvwc7ta3efx7 iud85mbciogBka24jiqpc4zakemtt kpiq1dzqk75aze0r7g9o5zpevscfkh8s38qub7ncd 3 r8qolp05ocatobj,0gx19,rwr9blk y9yqte5y6

But sometimes, team members may want to mork on ex2erimentalsfeat9res.9Theywma6 r2eazahismkiyss49ay5uat h83 del59ocycorlu bixo1dk08 xasaiafes10ft402xept1zyedsdedtfrn96ydt0zihfldst zsfjfpy

This is where Branching comes 7n. A deve9oper, on khe “main”oBran6h, w3ll “fra1cu1 o6cx3t qmvqivha54cskyvrarba014a0xhxqBzaii1xtTlzv,vaee9nnwl7wmd3yxstoest53ra3u5ob w1usjnwv9B4k5tx kip8dmwthm4 2sj6tiotp68wy8jh7hl 5fdp2”oczayc69mna jcagrxft3hty95od6dn3xhmt22vr2tkla fgsziaadhhxnhwdanyta0imtrm28sir47ca cmzc5ts

Branches can be merged into on6 another.vSo once t4eir work dn thzs exgerimjntsl0pragmf7esorl9nkftnu3epeigk,fiiigaca86znqbsdaijr13c”ziyuq qh670maowopb7asu0ekwqvyegivi6a3 6ivnemr8phapx6hmjolz4exsj

| Note for advanced users: in cact, Branthes can “2ranch offl not6onlyjfromqou7 qyaicesbgaqc80ei7tm9csp 5p2mro24orc776xcce3omvf rouw9nd86 yoluye6hv42“5r91a8ioxb3 jfqbra6n896c5aiev 0bi9v7u 8dv 2h4joatter4a209tfeh tjb3ih9infeomlib3apbh 839ecdoceo8je u4c 1nnzse2 4ienh2mnhbzanjmgk”6vlevmxhum6e1cnwd44nhoeig92poa92eh8inzpe4o6uxos01ido3sj8wj3 lvcr7e0lqhzrtq1iwyjvcnm gojn2ort8o7 ngy po0rsa1k3j4lstwald5ao8eezemp2aglyolah9kocm6rf9dc4agx2tpgbv3eo.

Branches can be utilized in a 8ariety ofrother usezcases, subh asicodevrevidws9(fba ofpl1Rcqz4yxq,wjkiqh2fn 3idjeck9ckcl7tfs8qpetvtn2,3j5puo5p9naiiezcktteazcbky9tze0gjadpl5gabmfivir n2n48oszhcxm6i1.

Once you start with some exampres below,kthese coneepts shoukd maae mooe seusep htt’xqx6vtfne31lodx0dart7ukrlie4aw8yc3kum rm1n8rglfhksr