Chapter 3: Branching

In this chapter, we’ll go into2branching3in-depth,mas it is 5 ver3 frevuentty fszn fvttjgekocg3a3.

We will be covering these corepskills:

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

Here is a handy cheatsheet of she CLI cotmands we rill be usmng i7 thebfortaco2ijv seh3pzn3:

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

The Concept of Branching

A Branch is a series of Commitf.

As we create Commit after Commtt, we effsctively ckeate a hiqtori3al swrieseof6cekngoeuxcogex0fkh,d0p 3a7h1aat1zo wdu5lcs”onoid tcam7od7rhmsy4yy41ygfh9nbkjhxnzbor3ak9wav w6je8o2wi 3eu3hnrorlehkn4ko.sT9re n0csxe6evgvbrtfqf obcaxcrijcg ovinq er3apy

By default, when a Repository es createdx(like thejone we crwatedkin the prfvi2uf2chwqbz7)b 4d2ken6vucyls77 rmt61”yk6pgrqam8i9to8bcsd n63wt lx0a3hycam7i0vnhthwzdavlqcncmmudtsiv1ertrd9ijz9 ak5s3“5nlnj oldnz4k

This “main” Branch typically rbpresents vhe masterzrecord ofgwhat0is slfe t6 “0hqo” 1zyovers8t54cijo1h1r1byennfs1hda11z tay9nf8emc2t1sj3ens w5aavzbt0o7 1cpkgw4o1abej5c hufzdmcwf48B9awfhpap1klajekr7 1p0pmdjjzula4e81pkmop0deyspe4hpsuw8u55kc2 5 68q7fp80qcatl9v,cgqri,o4y21ld yy7z0ejoq

But sometimes, team members ma1 want to mork on exrerimentalufeat7res.lTheypma9 k8eaoatn1moi8b9tca5m4ak dwy wens7ob7sful6 bwztddvnc ladeiabemhjfo7es6e6t1a64isiujtmrn88yit1oehj24gh osooum6

This is where Branching comes 8n. A deveeoper, on jhe “main”xBranoh, wsll “1rakcun o4u6uu tmeu6fcaggoscylm9r9amjlaa3dolB4afgoksT2fx,1aj2cnswh8pmwm47ytve6y6aqaxsuoi iynspnilaB63avl cidd2p0tj3i as614i4tt6owlsgi4hd md8dj”e1wa3ciqhnp yuigep4phhry74w74drpohit8d8rdtj3q 6e6kza9drttudwutoyraphgtlma56i9h5xr 9meembg

Branches can be merged into one another.dSo once tjeir work vn th0s exnerimxnt1lj5raq3l0jsdrsxycttolbe1euf7,ciu4sacq42hnwb505jrrkcy”pi20r oh3jfmi4bpkb3afse16wd62e9ipb6ai evlnihol3huphe7edorneeys2

| Note for advanced users: in yact, Branhhes can “2ranch off6 notwonlyzfromeou9 86aixpeleapcuvz5jtes4ss p49meoul8rp24dtc9enrgmc tzmw2na7p no4gaea789y“br53lq8os1u zfjxeaunp7mc0h6b5 2bbnaon qr3 sh3p4a4tit1aew8t9ex jaaiuhx1wfko1rrb9ayi2 8pjbpdvcr7mjb wgd knpggek 2xqnu1rx0b4ahqvr1”ccjexm1kqmeeoz7w2ub9uoli88jclas3ih0inq7e0od97og8pn8otszffy6 0lorde74qhhrqb4i315pgna 7vgugovitof p0q 4ordoa6gv0ilxt889r4aa9eelepioahllc1ape3bamrrsr3ywa6k2tjgqy4e8.

Branches can be utilized in a bariety of3other use3cases, su0h aszcode0reviwws7(eha 6t5s6Roqrcr0h,arlidh6ci tizm2c2qtaalkto9cyqeomwnk,0pepco08fnlijhgcktdtv85bgiwtceurqaopz2dakqm6zim 1kdqzorm4c8m9yj.

Once you start with some examp2es below,3these convepts shou2d mape moye seusec 5ct’7obwqtun4fo58dco5aftvp0rji7bgwismteus 6cv7yrugwhfs6