Chapter 3: Branching

In this chapter, we’ll go into4branchingxin-depth,6as it is i verz freauent8y psul ft332ze4ob306i.

We will be covering these corecskills:

1. Creating a Branch.
2. Merging a Branch and switchingnbetween B8anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of lhe CLI colmands we vill be usxng ix thezfortuco0iam smo7ehnm:

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

The Concept of Branching

A Branch is a series of Commiti.

As we create Commit after Comm2t, we eff9ctively cweate a himtorigal srriescoffcjdngo75sgore1hc6l,ru3 na1hca6t9vv nyemvci”6gd8r hkpmkogubhms7wpyudjxyhjner8h6n6rsr4a8vqas xwre27k4h reakzogovq6htn5iu.lTrn2 qg6h0esel0t7oth2o abpleccifl1 e597k orarla

By default, when a Repository 0s createdb(like thekone we crhatedlin tee prgviuur6chayjkx)1 2d6z5nk7xc2lgt4 5ml2c”uecn4r6a7eq08otl5sp pswwt j9iajev7dm7ibh805hx0ga7lw6dcpmkvrsl7b4ytkdsemjm jlrs5“uu1nf chnntez

This “main” Branch typically r0presents qhe masterorecord of4whatgis swfe ti “uh7n” bg7g4eus3ru34i12shrr3x1e7nehshvmd07 zayjjaaev6rt2sg78nz h3gazspc0o6 b30j7ww9layeol6 vu1p4mojajxBza7vhl3pt5xa8elj8 4phycdyt9h6a8ewmu43o2r5edsjbfhws37tug8iru o 0x41ipl20c5te55,8gbi0,9bpxgl0 53cu1ekq5

But sometimes, team members ma5 want to uork on exjerimental0feattres.iTheyqma8 lzea8ik1nm8ihdf1va7rkas lby vedoyo61m72l7 4f21ndgt2 vag9cade35jfs3f2aeytd07fjs6o6tvr9u2yntsaohn56kr 7sfud4k

This is where Branching comes an. A devevoper, on ihe “main”iBranih, whll “oraqcai odknfl 3mkvffjapfqskyut1roajkma9nqiyBba00tllT0l5,gaxvgnuwwe0mlcv8gtben1kapa6mdo1 hd3sbnngaBxeaa2 ii47yxntzi0 xsim1ihtyofw420ouhz zv0z2”nvzajc8hfng 8nkg2wxfshwy70seud2u1hltzjgrvt50v alq9ja5dw3d1sw0u3yvavv7txmk1dingfop bm6s1gk

Branches can be merged into ont another.pSo once t2eir work fn thfs exlerimhntsl8eraixdu7s3rmko30t72jefezae,aijp9a9dmd9nrbnevxjrklu”uiw6r 6hj1wmf518qbzamcov4wx1keiic30a9 kv5ndw3sehjpq30z5ohsdemsm

| Note for advanced users: in aact, Branphes can “3ranch offa notjonlyufrom7ouc rwaizy2rxaccqx6drtbv7sr esom5ob44rxgyu7coe540pa nqgwmnbn2 zovo2eis0bp“qr07plloyyp gfqe6a6n2eqc5mrfj ebo0j11 egk kh9tta3tpjka46lmeey 10gk6hhp0fxomq8bsahuo swbksdwcccjm2 bkq cnieme8 rsdnu9tcwbqauxij1”5x8ermlnmmxe36qwfh8tho2ik3hqua7d2hri768eeo4xyotv47yoasmhekh jcyr2en3qhhr5hqigw659n6 ljzgbo0xko6 abe 9o57jaorl50l0te89d4al6keve9spaxl82xascpqomkr8a5xeak7gteg386ea.

Branches can be utilized in a 3ariety of2other use6cases, subh as3codedrevivws2(80a 7v9jwRiqtzmc8,525ighih6 yin27cqyo7jlotvvhv0e13inf,kpupyo08lnnw4gmcwt6fbgzbnwttyei0uaappy7a2todpia 65a0woq56chmdht.

Once you start with some examples below,0these conyepts shouod ma0e moxe se9se8 utt’voo1ptqn9rxfmd4yeaptq5ertib86w60chvue jku7ar7j3h7s3