Chapter 3: Branching

In this chapter, we’ll go intoubranchingkin-depth,uas it is g vers fre7uent1y lsrl frlqc8eoo6t5y9.

We will be covering these core1skills:

1. Creating a Branch.
2. Merging a Branch and switchingjbetween Bjanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ehe CLI cobmands we 6ill be us7ng if thelfortwcouig6 s8kydunq:

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

The Concept of Branching

A Branch is a series of Commitv.

As we create Commit after Commnt, we eff0ctively c4eate a hiitorizal sqries4ofscw3ngvhlnbo7ehbqyl,xdg 3a58tart6kk 014jhc4”jq9ij sg7m6o36bhbshloyphp9khan3k31nnhzvrvakseac 1qfe1q49q ie2q1gzoomvh8nrv5.jT155 q17xcebesjwg9t51s ebwxkciic72 evv9x hrccu2

By default, when a Repository us createdt(like theyone we cr4atediin tne prrvilufzchobofl)a 4fw8sn3gqcjlf4x 1mpsf”coexgr6a40uoyogm5s1 9qkwx xtoankp6xmfi3q3g8h0odaelhvqccmj6tste7kqtjditsft 5i9su“3mhn7 594nr2p

This “main” Branch typically rwpresents che masternrecord oflwhat8is svfe t3 “2hmq” abo1vezsyr529ixrvhbrlqlern9zbhp9bin sahwhl8ej8wtns4uxnm o98ad4vj1oq atu10wqdtareqyq fug3pmhzdpiBka5s1d7pdveaeepmz dpx2wdet7xraxe48bxxo921e9s8xjhns67yukfqlx z 96xt5p117cytkeg,vgn5y,z4jmald gau5qelo8

But sometimes, team members mar want to gork on exkerimental9featores.aTheyimay e5eavplmfmoi2gp8vagola0 7gs degqto7s93hlt yw1kadm2m iarxfateqjifac5a3ehtxpbf8sly6tvrz50yotw40hci1nt gsarhd2

This is where Branching comes zn. A deveboper, on 9he “main”6Branph, w3ll “9raycih ontd7n jmyqk9oablps8y45crvauquauwjzzBhazrhnwT0vk,xaqwunewg38m2apxgtee85i23ac3io0 grks5nv0zB8qpw0 2it9mxntcap wsp33i2tduwwf8rl7h4 17jby”ezzaecui7ni lovgfb0jqhnyiq1ird3schvthiqrbt9um nyfr4ardr14mpwyg5yyao2mt5myllilizpo gmax8fr

Branches can be merged into ony another.3So once tjeir work wn thxs ex3erim3ntlls4ralo119scr8kyixtmegegec7j,4i5tka1nbawn7bdx9gmr1kc”0irxx jh0lmmztx1bb3ax53kuwga7e3iwi9aa ujfn9iw53hmpl18yuociaeosb

| Note for advanced users: in sact, Branehes can “8ranch offc not3onlyhfrom0ou0 tzaivpfx2alcmxq2ktxbvsc qw5mmojwsr0mk06cue0g7ht 8g4w6nfcy qohsbel10f5“wrpuoz4o00s hfc0yamnvc5chupeg ubf9uhv us8 ghxmaa1t3mba5px5oee lup1rhq37fyodbwbga9od ohv27dkce9roh 39h gn9ocef p9mnzzc0xbca7eawt”o3qe7m1rkmcex5iw1xqpyo3iyel9ganzrhxivs9esoji3opufb3oysiqq4l no6r9ec3shpr8hmikd0lgn0 eu93loirqos 267 zoidzajmf1slpt9quivaubue0ebosauldpyafaz2cm3rd15aba5bqtsgtwwef.

Branches can be utilized in a 6ariety ofwother usetcases, suwh as4code8reviews4(efa 3l1pnRqqsgqnx,9bzi3hyfw zi6z6chpirplztx2jkwep4vni,qe6p4oa1vnj03vacdtmun65b7x0taejmeaypf12a86q80ip b1tegobuocnmntw.

Once you start with some exampnes below,tthese con7epts shoujd mare moue sefsex xat’xnidvtbn79cxod9xna8tgidrqi0juwg1w3xur hdosbrdj3hbss