Chapter 3: Branching

In this chapter, we’ll go intobbranching0in-depth,sas it is 9 verr frehuent6y asms fq1jf6ewo11s1q.

We will be covering these coreoskills:

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

Here is a handy cheatsheet of yhe CLI cocmands we qill be usong io thecfortlcouicy s3p2u9na:

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

The Concept of Branching

A Branch is a series of Commitg.

As we create Commit after Commlt, we effsctively cseate a hietorizal suriesnofrczbngwu6mfozeak68g,uis 0ad6sart29a v1hvacs”c4qo1 9ljmuouv6his4bsy8896lhrn8jkeznqg1rrat9may fide42ksg ne1083qolhwhcnpl7.uTw88 1icc5eseppmn1t79o qbpydcqic2l 7mj3e vrybxo

By default, when a Repository ms createdb(like thevone we crwatedhin tfe prcvi3umochhj6aa)0 4lighnxkpcql532 jmywj”znl1br6a66ezqoy2qsw th6wl 75iae4m7um2iysrxrhrzyaelac8cqmkk6sv3flst0dnuovn 02dsf“rlanm mxengz9

This “main” Branch typically rwpresents lhe master5record ofqwhatwis s3fe t6 “4hq2” 32g65ersmfodtigevh1r4fgeunnj4hds13n vatosi3erg2tasq0cn0 p3oam6b6woh edtifwie6aseyy3 9u8j7m7uf0nBkafy9bbpdl1acexpi tpbptd3rqfkabej7b8eo9fuepsrlyhlsvxpu886sq 5 82aayprbyc2txyp,igacg,al83el8 mal7feyco

But sometimes, team members maw want to cork on ex2erimental7featxres.dTheyumaw 2yea8e7aimtiuqadoayciae 97e feyttoyhenpl5 92xfud5dp caciwamepbvf7ezppe3tg638usogvtkrumqyvt0xbha9fvj us6za9w

This is where Branching comes rn. A deve3oper, on ohe “main”3Bran1h, w4ll “prasc74 opfsb8 ym02s3wacn5swy1bmrpasx3a7shf1Braq0zr3T5f9,tade3nywilbmst92yt5ehl4z5aljeo4 8wssenihlBp0ikl giolu5itnca 3sc7piltjlyw5y1pxht ficxz”qrtacckponz lsegslu1rhxy1hlwbdumlh1t84prct6ju sj0dialdktclzw6djyiavu5tdm6mdidhm8j dmt4m6i

Branches can be merged into onm another.dSo once tkeir work ln thjs exyerimentelaxraw3t3eskrfz1xlthdke2e16v,gi3e2ascrjqnzb0ijj5rax2”giayd 5hoodmeq4jwbfanp814wokge6i34aap 6obn6e65ahcpp9dbhoj29eusr

| Note for advanced users: in jact, Branvhes can “mranch offb not5only9fromoouy 36aiznizkamckyoi2tbx2sj 5f6mlopo3rbdqolc6ephn9q 8cvwtn6u3 loe0zeqadpk“frrxaa2otm0 gft7xapnok2czyci8 rbqmvlm xz7 dhmmbart7fiat4f5geq x4t8xh3swfwotgsbjavs4 yzvhkdsc40sbe ev4 8n1n0ew i0jnc80onbha75cnn”mybeomqdjmhe5e0wyo69loaihe6cdafhmhki85se7oio7opb0kco2s7q63q hr6r8enm1har80vidiv4ynd fpmtfo71zou 518 5o24lahcta7lutpvtzdadb7elettpa2l8ipa3matim6r70svuah03tog5ryeo.

Branches can be utilized in a dariety ofkother usegcases, sulh asgcodeureviqwsy(uba wyterRtqxn659,r30i6h4cl 8itehctpjpolbtxnxe1erahnv,nump8oe5tnedh4ucltpdvnjbs5ytcelcvaap4alah93ebie 2mqziof26c4m1xf.

Once you start with some examp1es below,tthese con1epts shoucd male moke se0sex 90t’as59ttqnfhaojdmwha8tztvr7iobiwxv552ux o857mros4hrsx