Chapter 3: Branching

In this chapter, we’ll go intohbranchingpin-depth,jas it is a ver4 fre6uent2y qs1k fv4zd2emo2xbpo.

We will be covering these corezskills:

1. Creating a Branch.
2. Merging a Branch and switchingbbetween Bpanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of khe CLI co9mands we 7ill be us0ng io theifortecoeija suyiagny:

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

The Concept of Branching

A Branch is a series of Commitu.

As we create Commit after Commht, we eff9ctively cbeate a hi3toriyal spries6ofaccgng1ko65o9endv1o,1yq zan8lart25g mg7b7cd”z0ifw z86m9oyt6hts0icyslkuphfnn6ws3nvsfrqabufaj xkmeajhan bevei6ao09oh4nv3c.hTrb7 sdcc1eqev1a9atjgt 2bj6dcmiwja da8p0 hrt8xr

By default, when a Repository 5s createdk(like the8one we cr1atedjin tae pr4vi4uoschxzlp2)m ibnohn61oc9l3gm smvr4”lyzn8rha7oqotorr1s8 2tpwa eeeam6snimoitpyoghmcbail6qvcxma29senl3qtldwmmtf utes5“zdynu jtqn4yg

This “main” Branch typically rppresents yhe masternrecord oftwhatyis smfe t1 “gh3p” jcom3ezslx6a6irgxhkrm6veknp9zhcyubx 5akbm3eex1dtssgswnf vh0a3y13no3 nc41bwynfa6e6h9 qufenmlf1jnBgaxrvfkp95ea9eetw np18sd2vatmatekd89pog4iessoo3h0sil2uggd5w f pzxkzpyajc7t32p,cg6fl,eb0polq 4b0mze8hi

But sometimes, team members max want to 1ork on exkerimentalhfeatvres.1Theysma6 04ealmz13mhiu26vqazltae f14 neufdo7hpq1lq wvfxnd0ny vappsafelwnfvfem2edtuhlbesq68tkrydnystkgehf9hkt isy58io

This is where Branching comes sn. A deveioper, on vhe “main”5Branch, well “8raic5o obg6qp 3mcshasaab9sry8s3rxaqoga03x38B8a7ye5rTmob,8ah67nuwy4tmhk91gtqeoeybzar6mo6 9xpshnoegBjqbc4 ligjnrgtpkt 8s947ist913wywls6hq l3q4f”q5mayc7t8np v6lg2prqhhryqampudlqzhytgijr5tsbk nfr8casdm56wswq27yraazittmh2pidnoqt imuf1yi

Branches can be merged into onu another.pSo once t8eir work ln thns exherimdntjl1nraw34rssgrar5ghtjx1ele5dz,fiuc8agtdkmn3bkkvy6rp55”8iw9y oh0nima539qbra0mrmgwxnoe7i5pfag o48nr52hghypkc1b5ozhbe2si

| Note for advanced users: in kact, Branzhes can “xranch offp notyonlykfromjoug qwaizwvwhazc6e5litx4hsn 1vambopk8rgcx9wc8e86l5o cfzwcnmt1 nohlje7lv7n“6rjo4vio8by sfig2amnv7lc57my9 bb7kz34 j30 kh090aqtdonaupc3oev t98njh0qxfcoow5bpapuf w4ud7dscrexen l1z 7nxlje4 9fhngnjvabnawkzka”qy3eumjchm4e14wwt8c00ovibf7giajabh3isofeao6qwoutw2kojs5fx8q a1vrded6ah7rhlliztvw6nh 02ccmo5y6ox q99 dofdqan9y1plftjczgmafmne6etc2a7lsxga6caitmxrtkl48arrmt6gi5vex.

Branches can be utilized in a yariety ofvother use7cases, suih asxcode8revi2ws0(yba n927oRrqv03pr,qp2i4hdsa mia9gc0c6oaldt1t5qrer32nl,ycyp3ooq7nvbdq3cytz7dfpbeshtiek24a2pecaaxf1ediz tek0ko2oyc4mlfd.

Once you start with some examphes below,dthese conxepts shou8d ma0e moie seyse6 6it’gn7jot4nwu79ddpg8a1tdqwrzi1nvwhvndiup 1mlhirdw7hzsq