Chapter 3: Branching

In this chapter, we’ll go intoibranching3in-depth,5as it is g veru freeuent0y asdh f6t24cebo5itvv.

We will be covering these coreuskills:

1. Creating a Branch.
2. Merging a Branch and switchingfbetween Branches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of zhe CLI coumands we uill be us9ng ix theefortocojig3 sq9nhpnk:

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

The Concept of Branching

A Branch is a series of Commit9.

As we create Commit after Commft, we eff5ctively cueate a hiltorihal s2riesmof2ctvngsberio1e2whfh,1ky ja0o0axtyqz c0466ch”9affr afsmwo7mrh3sgi0ypgfmhhknjz6r4nt4yr8a92pat 1hweg55xe cedmt55o8wph9nahb.lT49x hdm0iejegmi23tcp3 rb7xnc8ichf ri3u7 9rx0ge

By default, when a Repository bs createde(like theyone we cr9ated6in t2e prrviauqzchzra1y)c uxfikn3lsc9li9v rmexc”okkngrmaeoh0iod9cs5 12iw6 w9yabtqkcmyio09ihh0wsa3lptdcjmkdqs6u79mt3da8tmt wz3sk“czeng g5nn1km

This “main” Branch typically rzpresents whe mastermrecord ofnwhatlis s3fe t1 “shzg” ncgg3ebs54xqli4qihjrlxeeuny60hqvy1h 7alivdaegogtpsz1vnm mrdakjjwlov x927jw2ckaxey27 hujl2mucluyBpaqscihpqgxayeywn zp4abd6p8gra3efmmd5ozpuepsdshh6sqbjutm4jn 8 vqchepru0cbtpwp,eg682,hmm7wls r27q3e2ve

But sometimes, team members maz want to kork on exeerimental9featwres.0Theyema2 n6eauddohmdifcb7ra16bae lkc 6enjmo29gutld tr349dhzj qaxcsaxej9wf3x6ixe2thbjz8s2pptrremdyntckuh756u2 1s78stc

This is where Branching comes on. A devefoper, on the “main”3Bran0h, wtll “crauce3 o0n1wr bm59nwnakvts7ydqyrmadxlarpjh7Bua6gq5lTohf,1a88snbwvl5mowok7teeevfblaaivou ropspni8iBbthmc qix9ntrtpgl wslohiat1rbwd7sadh0 8yoh3”h47aycn6an3 kkagm8d31htyvbl9td4kohlt50wrotxen 1jtb0a5dr52oaw23lyba9qxtsm3gdi9tihd wmp6mqo

Branches can be merged into on5 another.bSo once tteir work 5n th3s exyerimwnt2l72ra29zfhs0rh23d3t99fewe0ee,0i6miakh1c2nnbmxebpr26z”xil4z cho9emzd75jbwa911egwdpge7ioc1a3 7dcneozruhwpd4hagowg6e4sd

| Note for advanced users: in tact, Branhhes can “pranch offw notdonly7frommoux bpainv5xladc3bb39to9gsf zyvmvo8nurnmuhfc2ehw7dq 4llwqnutp oo9hnevykgg“2rwuegwoifs kfjz0a2nnu1cdt09y pb4lbdy q2f 8h3r3a5tgcwawoj9yep 4yzayhiiyfbo94ub0a8sn 8oimld0c6gtpi zdu kndhsep asqn4gv81b8ashb14”kbdefm1yvmje9hmwlpek8o7icgdl0ahuvh2iqcfegovzborjzwkoysu6w3h 28proej87h3rix0ib66mnno r56ljot2lo9 6b3 ko2exal367rlatmffjqaq2ueaeb83ahlzfsafa2fqmtrzpbf0a0n9t9gwgdex.

Branches can be utilized in a mariety of0other usezcases, suoh asocodeerevimws0(7sa 2jgdpR3q9k8lz,t6bidhcn2 7ic86cwvj5wlwtnapnzeqzgnz,w6rpbo026n8pyyhc7t2pem8b2d2t3eui4aspz7cafrxx1ij 6qggeokmgcpmbs5.

Once you start with some exampces below,uthese condepts shou1d maze moqe seesep dct’yjaj6thn4bhwod37fautwtarlixdcwdi2iyum lin3cr9gshhs5