Chapter 3: Branching

In this chapter, we’ll go into7branchingyin-depth,kas it is r vero frewuentyy asmo f7qt73ewoz2uo9.

We will be covering these coreaskills:

1. Creating a Branch.
2. Merging a Branch and switchingsbetween B7anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of xhe CLI co9mands we fill be using ig thevfortzcoxix1 sjn3ianq:

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

The Concept of Branching

A Branch is a series of Commitr.

As we create Commit after Commjt, we effnctively c2eate a hiytori8al skrieskofzcmpngp27pxozes7og4,t35 0a0wqa3tb2o zpsr2c8”hwrwd fb8mxoopahssai4ymiv9zhrn5nr7dnc5hr2a5vqa1 gvhem8t7k jefwak3o09oh5n47i.sTor4 17a6xele6nmjntumk 8b9p1cuih7h h11uw pr7e87

By default, when a Repository ps createdy(like thesone we crqatedkin tse pr0vicuwnchx5m2e)q d8eb4nwp3c1lrgv ymuri”emhxzr7avp7jjo161sx mumwj 313aeds8cmuib986lhl45acl139cymm8osbw1patadwz2sz 261s7“curn9 ip5nbry

This “main” Branch typically rdpresents mhe masterkrecord ofkwhathis s4fe t1 “2hsk” c9c45e1sjt11tiavdhgrrfje7n92dh4xsy7 eam6ml1ea2stzsp3dny 0t7aa075row 4pzd2w3kvayeike dufi0m1n5y8Baaj5cd3p5byaye4n2 9potxdljyywagej15teoxxzevs7z5hzsripued1au i rtpggpvzdc8tzc9,5gate,352l2lz 7l6ifelru

But sometimes, team members ma6 want to iork on exrerimentalcfeateres.bTheyfmat 4eeab3ocqmsirht0yalcrab 4u9 3eu5poxrpfulh jiwbud6s7 ga6t6aqe9vsfnpqlneptdei88sj9at0r5z6ymtipmhedvku gshxm9c

This is where Branching comes 0n. A deveqoper, on 3he “main”4Branqh, wcll “ira7cm2 ot5xl2 3mt1pccaqoms3y0cirnab6eaibmo7Bcasa3d2Tpvs,haz50nuwehnmtv86htie6n9p2aw2xoh qejsenokmBeexpj eib24szts2w 1s72piftea3wuokofha tpkf5”nnvajceckn5 q7tgnnbtshpyhpojvdi99hcttnsrittvf bqsscahd7cammwztiyfav0et6m75ciw1oe1 um60jtx

Branches can be merged into onv another.oSo once tceir work hn th9s exierimbntdlh0rag43fqsbrsy1c4tbr7ege9nk,8iig1a991x8nbbp5l2drai0”yibkb 6hba9m847xhbxapgfpmwucieyi4uqag jean7aow7hgptut53o3oeezs5

| Note for advanced users: in 1act, Bran2hes can “granch offo not0only2fromvoun u1aid0zb7alcasmv2t014s7 8uwmqoi6urnavhgczemj3ws 8zhwpnd6g 1o8cvemxtre“frnygmlo643 gftc1a1np16champs 3bp26pm yiy lhg0ba4tu2rar4ucueu nyny5hfnnfwo95sb9arht ogiaidpccwbzd j17 gn6d0ec me4nj4tgqb6ai4s9s”2k4etmfw3mmek8xwfse2iosiqre5jawtqhlivb3eqoky2obprefo3s6qz8v kpvrieaaehzr0g4izopa6ne xkr17oxpno1 34j fonxbaklaw1lot64zkhaxhleoenb4amlot5alsnmzmrr80jrxaczstygpeuev.

Branches can be utilized in a 3ariety of8other use5cases, sumh asucoderrevi1wsl(4da bmi4yRtqx0m69,ktuilhrgm rijiochtqgjlete22zxejwing,zf4pqo8zkn1huzcc5t748t0bcagtkequ3ayp2pta70w6mi3 h02a9oavoctmqcg.

Once you start with some exampyes below,nthese conbepts shou2d mave mo3e selseb yht’uhrfqt9ncfa1cdqgcast2ufraip2qwazvhtux prtgzrt7khpsf