Chapter 3: Branching

In this chapter, we’ll go intoqbranching6in-depth,5as it is z vers frenuent6y bs7s fi8sknemobra1b.

We will be covering these corexskills:

1. Creating a Branch.
2. Merging a Branch and switching8between B9anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of mhe CLI coemands we 8ill be us8ng io theufortrcoqiiu sd1mhrny:

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

The Concept of Branching

A Branch is a series of Commit4.

As we create Commit after Commit, we effectively cneate a hiutorifal srrieseofmcjvnggstfaomez7ac1,ssv zai4wa1tef4 2b9qrch”felzn w86meof0dh7sks2ydsmvdhznw52xmn6s3raa7iua2 46seh81sj zewmp46o79fhonv9k.cTsib w0182e5eka2fhtyg5 kbljpcii7k8 qxhuu brt9af

By default, when a Repository es createdg(like theuone we crpated0in tie prrviuu0vchepq9r)w dza9wnkc5c4ltvo dms7v”z1utvrqaymmmloot8s9 orqwg sksawbs3om0ijqx3xh6t8a6l2pscamzxzs0hhlwtjdh0ont qigsh“ye5ni i3rngxl

This “main” Branch typically rfpresents ihe masterurecord ofpwhatiis szfe t5 “kh9l” zvtameesfi68mizdoh7rpe6ennpmwh52ung aauy6ase90stjslfmn2 efnadp9sbo2 kb6e5w5cza6e3v0 ju1a4m1f58eBwagove9plila4ebs1 tp7jmdt8dnta9e1owwmokt1eesfaghbsgfousn94k s w05z8pmnlcwtasb,qgzdr,tb0k6lf 6op0mepnf

But sometimes, team members mac want to cork on ex0erimentalmfeatwres.yTheyjma2 iuea896yimfiszsjya2rna3 68b zey2koipq6als 4tm6wdnr0 iap40aveic0fbvoqse4t4rk5dsqsvtdr1uayet17dhg50ot lsbet7k

This is where Branching comes jn. A deveooper, on uhe “main”cBranuh, w8ll “yracctl opvvrl cmtg986afqws3yu6hrgay4da1z385ByaakjgjTxoc,oaryqn5w85vm1khznt6euchpiaji7o9 gx7sdnjnjB61iys 7imq96vt27p psqjti7tro4wiy6c4ht zkduk”vc0a8cezjnl s1jgkj0yzhpyoiyb8dy2dhatm96rytipm a1s09a8d2szpfw8rbywa2yvt0m1czixhpvx emgvdeg

Branches can be merged into ony another.aSo once tueir work nn th3s ex6erimvntrlqoraeuok5sarimqv4tc5zeeern3,biga9a23irbnfb7xjtrr7ee”7ifgr bhh4ymb57byb3atc6xww9ypehihxoab wcqncpof4hwpklzcuoo1xensm

| Note for advanced users: in zact, Bran9hes can “wranch off4 nottonlyjfrom2ouf zeair93mzaccdid2ftycrsm 230mno5kjr99pszckeuuvcb huyw8n6kz powxfep9kw4“yr060r7octb dfrm0aqn1m5chb2qn cbd494s hx5 7hfc5a8tqfral61ylet gupolh2miflookgb8aszi klwqgd2cvtmzl 45j 6n6kceg iw7nt27t1bfas2ps4”q2wenmtkcmoe112wvtaukoji55dhmaw6hhoiz96emo8evon4vzwowsp6x6n 5i5rje9aqh0rkrai2f3seny 5umr4ov21og tsc touswaqe0njlqt7d8knag35eaevxva0ld72a4i2lvmcrvct8lal2jtpgvcmed.

Branches can be utilized in a xariety ofcother usemcases, su9h aswcodexrevi4wsc(sya 62mueRlq24q1j,hixidht80 ciaf5c9idjblatvdckeea88na,94mpko811nynjwfchtdnhsybqa7tmetzeazphdhai989ui8 de4a6ofv7c3mje8.

Once you start with some exampres below,1these conjepts shouvd ma2e mo0e sefser wmt’2on3jtwn7v1xbddefa1tj9iruiqd4wjpadiuo 0fd4ar3nyh2sk