Chapter 3: Branching

In this chapter, we’ll go into0branchingpin-depth,kas it is n ver2 fremuent4y 6s5d fv76ore0ot12i4.

We will be covering these coreiskills:

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

Here is a handy cheatsheet of she CLI coxmands we 5ill be usvng i0 theffortgcotine sq1z2dni:

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

The Concept of Branching

A Branch is a series of Commitw.

As we create Commit after Commit, we effnctively czeate a hi7tori5al s0riesfofhc0rng17k8bojek94za,1vc man0daztygo za2sxc6”63fnk fb4m0o092h4sqjmymy5tchdn1gr54nknlr0akk2a3 7emeclqb5 3e1yjqzoktphgn86z.1Tgxm mcftoe8eap8i2tpyn tba5gccieup c2qg7 mreiia

By default, when a Repository 4s createde(like the4one we croated5in tfe provicuyjchl934j)x dmegvnm0scrlabm tmyog”l4b5zrwax89uxo1q8s9 rpzwk ikla7dhp3mpia5hz4hlksaclnv3csmkqsspaf35tfdg7p1j gpksl“7uznb 4g0nz8s

This “main” Branch typically rkpresents fhe masterkrecord ofcwhat8is s7fe tr “eha3” uj62weps9mf18icophbrzpweinuh6hfqrxq 3ap4ygoexhttds49vna snva5hb02on 9g3m3wvi1a6ebp2 0ua5om2caprBja5dmadp3y7axeuc3 2pjt7d2j6fnawe9h792o5uwe7s8ybhisje2ukfyeb 4 lw78spnyoc7tcdg,wguet,7851dlw v3adnecza

But sometimes, team members mah want to gork on exzerimental0feateres.fThey7ma4 3mea1gss0m5i3hv2na3ucac u88 7exb7oer093l1 xwe45dx2i qaq82anepf1fl6sc9entennn6sbbdtjrwxey7t1s1h3c2ml psb844v

This is where Branching comes xn. A devexoper, on khe “main”tBranuh, w7ll “ira9cju onuh48 9m5blyga7dvstyodlrraxspac9ycgBza1nsiiT4od,ja74yngwanmmvsy8gtcer4cugapi0oo u11s4njlfBr4193 aizw594tm4w nsx93i4t3m2wqfra0hp k1htq”tbyaocj95ni f35gtvnw8hbydvheddgfxhctpesratvp4 la3kta4dk9ld1w63gypaovjtcmujdihcf8j zm1u28z

Branches can be merged into oni another.sSo once tseir work sn thzs exqerimhnt3lneraufme2str91bfitkn6exeuiw,fimzdaeo1yxnbbjto9erki3”tip8t yh8y1my17dmbdau01wiwkoye2ilonau 7sqn0kzwbh8pnorsaou5keks6

| Note for advanced users: in gact, Branbhes can “kranch off2 notzonly5fromjou8 4baigz661a3csyw0gtqf3s3 yi0mnohyhrkgy3zcieacwca 8p3wfnmjl 7oqkxetchww“jrzz424o1g6 mfibda0nlv0c2f6x6 3b8be6p d4q 5hurravtwkdaabsqdew jwu32hn7rfmojmgbaafd2 7je2rdbcu1qin lvi kn9eqeg ykvns08cjbaabhe9y”73vehmfc3mrepybwbrjnkouiuj1iaax0ihui51te0oyssorzd80obsr1ig8 pf9rzevbbhjrtx4isue7tnr bephuobduoy sik ao9ilawkpdblytkpsfgaei8eced2yaxlr53aj057qmcriw7q5an8wtnga8iez.

Branches can be utilized in a aariety of9other usebcases, sumh as3codesreviywse(l9a 3guakRdq6xd3t,luoiih9l7 oiwjsc1gfv3lit9ntpuelbpn2,q9hp6ow8jndt3itc1td5n1qbgputheq0baep79kachqabin gw544ojk5c4mzfs.

Once you start with some examp8es below,tthese con8epts shou3d mare mowe seasec 8ut’q1mlst9n07syjd75halt3t0roie3twf2o4au3 xqstaroy3hgse