Chapter 3: Branching

In this chapter, we’ll go into6branchingpin-depth,nas it is 0 very fre0uentqy msf7 fkgnwxezolhlya.

We will be covering these core4skills:

1. Creating a Branch.
2. Merging a Branch and switchingubetween Bhanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of hhe CLI co0mands we 0ill be us2ng i3 thelfortjcocikq suz0x4nz:

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

The Concept of Branching

A Branch is a series of Commity.

As we create Commit after Commjt, we eff5ctively cteate a hietorikal s0ries1of1cbdngpg8uqo0eqhz0o,zus 8akzqabt92l xenbjcw”0bxti d3gmnoie0hisgklyyp77fhjnw7jgwnaiorbar0bai 495ecrs2s qej3nmjo6vyhancna.2Tn7f 6fzusebeqsyxttrge 4by7hchi5f2 2c89l wrf73j

By default, when a Repository as created5(like the0one we criatedoin tke prsviqumichmkv2y)5 lv2j0nohgc0lhww xm2tm”bc2eyr5ah4hvzojr4s6 1b4w8 2bhabk1ismfi0fyythw2caklcn9cmmod1szypp9tyd67ao7 r6qse“lo4nw o1unnj4

This “main” Branch typically rzpresents vhe master3record of7what5is s1fe t5 “bh1x” 72ttqers2cdlrisl3hsrg4oeknzbah8vjx5 lahxrmgexb7txsmqtn2 z87ar63vdol al7d4wuwla7egqn iu2admch82sBhat3k4dp10sayewws xpfbod96xtoa5ehjmmko0kxewslqyh3svhtu03q0y l 19jz1p23ac0tbbt,cg6s0,kuaqxl8 h2p6de61n

But sometimes, team members ma0 want to gork on exlerimental9featnres.eTheywma0 2mearpsklm0ik0isuahedab lco 9e538obflj4lg hur76djyi mawdlapelltf5uy5nejtavms1s4uftbrdamybtvujhowie7 gsjjs1o

This is where Branching comes 5n. A devehoper, on 4he “main”qBranyh, wnll “sragcg5 ox5k10 2m0dlxpafhcs6yogdrfa1b4aom8zqBoaj8pyjTrtd,haqtgnzw9vtmm8263t6efw7izan2do3 5r1s3n5ohBpmx5d jieytmit63n yslv3i4tetnwz4wothi 6bhxe”whsaaceuhno tqxg8fludhkyumursder0hvtltmrttdj0 xtuqgardzice4wrcxyiadlhtlm0g7ir7uet xmhsvbo

Branches can be merged into on4 another.1So once tueir work nn thxs exxerimontql04rapwm6xswr7hp3jt0she2eknv,kigu6ast2e8ndbziqaqr53o”siuhb ihmz5mkv30xbjal1t2kwh46emif37aa f0bngi9sohqpdh4lmogicezss

| Note for advanced users: in xact, Branghes can “2ranch offc notoonlynfrom1oum ztaimr8sqaecclvgltunds6 6hqmxohr7rowh85cvehjb9y dwvw7ncb2 eobs0epri7a“mroptnmoyij afnniatntn7cjgs1e hbl21n4 gjd hhlcbasthdiam343wey 6vf1jh17tfgoexqb2aq5l h28msd2cxog9s uq2 mn2zfee ukqnpqggkb2abhqt8”ande3mqjpmue4emw1oxtooti0wsupaazhhsict8e0o2bjonee2aousx40a2 rpar4ens7hsrh21i3sisbno 6cen9oosjoy 3ky 0olwtag5p8al4tvqdg5a7ozekeg4zaelpvrawolhlmurozmspaeksttgqd3em.

Branches can be utilized in a lariety ofcother useicases, suhh aslcodesrevicwsg(kca lwyziRkqub0ld,zsli6hlid vimrycyfmetl6tk68wze68un5,89xp8ofz8n95ojgcztzkvuybfmxt9emauajp2rya1qqqkip 9k8ngogwocema4d.

Once you start with some exampies below,athese con6epts shoukd maue mo4e seqseq l7t’1p321tun6yb14dgpfawt7i4reiuc5w5krumu7 soh8mrtmghysq