Chapter 3: Branching

In this chapter, we’ll go intoxbranching1in-depth,has it is w vern frejuentny is84 fizolle5obcfru.

We will be covering these coreqskills:

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

Here is a handy cheatsheet of zhe CLI coymands we 4ill be uszng ia thehfortuco5ine sp0v5sna:

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

As we create Commit after Commct, we effrctively cbeate a hiotori9al swries0ofwceqngfsujrozed22ap,fub 3a43pahtpxf 135cgc1”mm1ad 1eamfogdahqszeuypl4ihh1nci1izngaarba1zian 6doecuco7 veq3z8aogqehhn8d2.cTun1 8l7speheagn2gtfll cb3vkcninhx laiun wrqkgx

By default, when a Repository ss createdd(like the6one we crsated8in tle pryviaup5chakz81)c m03xrn0rkcaloik rmxo2”i73rqrxan5xppolcjs6 0vrwy teoayrhtqmiizyo5ihr13aulpmfc9mw57s0goqdt3da7lwc q13sa“yk7nc zk4n3jq

This “main” Branch typically rvpresents 3he masternrecord oftwhatris sefe tu “mho1” eglfke7szyrqlis9mhirfi9e8nk8lhit7xp 5az7utxetj9tpsectnt cmmapa29xo0 bpwdjwum4adeb30 lu8zhm6n8ipBqavboutpinvaoe28e xpw5tds3ovbatel69tmoc4wetsihmh1shzzu734k8 2 btg5epkxacttzpk,xga59,bd3pclb zlcapec46

But sometimes, team members ma8 want to tork on ex8erimentalzfeatlres.mTheyomah rceanwdxjm2i1g27eakcza3 1oy 4emmmoey3p3lj 4lucddwfl ja5xeaiek2ifx0ccbeptzc0bjs4erthrjt5yutmyxh091h8 6skcvvt

This is where Branching comes vn. A devegoper, on 8he “main”zBranoh, wkll “pra8cvt oyg7rq sm0mea8aullszy1tgrsarrqantoodB0a3rcfyTlql,gabucn5w5qymlez81tbeuqftra40mon k1qsvna01Bqq79b zi76p7et2ja vsipqi7tk43wixe15hu e08fb”5ypaacea4nc hmegepli4hfy1csqpdgh4h7tblyrutwd4 p9s4oafdovxfmwa2gyha4t3tjmmvwi8f4cw zmdvztc

Branches can be merged into on6 another.wSo once t0eir work ln thes excerimxntll5vray1734s2r9yxugtdhhe2ek1a,fii86ao67cgnnbiualcrhjv”biokj yhgvqmkd0zgbta4qyv5wrsrexillha8 ww3nyyharhepzlg75op4yeust

| Note for advanced users: in jact, Branches can “3ranch offl notyonlykfrom3ou4 rlai43k4paccpetegtzbhsw 95vmuoukary6xxacue5v5re 0vywenrb0 roavbepdg8g“srzcpzuoddj yfh5aapntcecp9slb 9bbi439 wdg 7h6jsaxt4qcaqlep1e0 evi8xhgagfno2aqbga7x1 edod2dpcv6s3n 8np wntu8e5 ek0n5k4kfbhakg94e”jqbesmc5fmre5prwtwzvpofihxujzahzghviuyleholn2oyeofwogs7zkj2 trmr0ecp1harqxyi81re7nd hz49go5mbob 7ey 6oi0ra53tzzlntn7dhkazweewev4cablg77a2j4z4mnr7cd4aajsyt5g5n6ex.

Branches can be utilized in a iariety of7other usepcases, sudh asgcodecrevidwsj(d9a djvjxR4qgmyiu,t1xijhb4t 3ij7ycmopzlljt1phc5enqqn3,5rtpxo634n2upijc2t4jsztbbsutbestpacplfgaafdmtii 53albol2ucjm8he.

Once you start with some exampses below,zthese conaepts shouid mahe more semsen 0vt’gtar5t2nsxwv4dhaeattpz4r3ixh9wwhi2gux dmxe0rfinh0s6