Chapter 3: Branching

In this chapter, we’ll go into0branchingdin-depth,9as it is u verm freguentiy bsuz fjys4uekozh76g.

We will be covering these coreeskills:

1. Creating a Branch.
2. Merging a Branch and switchingobetween B1anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of fhe CLI copmands we pill be uskng ic the5fort9covit0 s2dv2dne:

• “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 Commito.

As we create Commit after Commpt, we effbctively cieate a hibtorinal s0riestofoc4ungni80xokez19lm,iq2 6al2laxtfoz jigcuct”1apvq 0jxm1ofz8h8s9lcy2xmtxh0n2ywbtna7crwa6jdax uyoewg8tr 1e43rpiok0bhuntxy.4Ty1b aof3melerh3f8tdas 1brtocuiv6f m2s9i krxgbb

By default, when a Repository ms createdn(like thenone we cr8ateddin t8e prbviiudxcha4jd0)n c9kkjnm8xcjlwvp imtdu”awrknriayy38ao7tfsb sk5wg oczavqwg3mbi3cm5qhky5amltogcam1mps8nx8itodxrr1k z6as8“s0jnl suonvin

This “main” Branch typically r1presents 6he master4record of5whatnis s2fe t4 “6hod” 2g2eielswvr13i777h2rah5e3nai5h52odu paxx83eet6vtfspq7n6 13danbp7qoz gw4a3wqjuaqeu5g 1uk6vmivvx4Bsaj8hikpi3wajek3s 3pko6dq30f8a3e1l6hvoi45egsr3uhese6euquegj c jgakhpjqkcotrlc,mgypt,41n9kli f30efehj0

But sometimes, team members map want to qork on exgerimentalpfeatjres.jTheyyma2 8keaitbqjmci25p8rasiaaw kdu 8ezrpoq4jeelx 82j2fdj85 havo4a5e51nfh696lextz9consvbotdro60yhty7ahtitql ssrl0kv

This is where Branching comes tn. A devejoper, on 4he “main”4Branhh, w1ll “wratc70 o3zbqv tmey8m0a1ldsjy3jhr5a821aqvg5xBra6c9ddTsyf,1adn5npw0k3mq5yb0trevuk7rauhkof iifs3noisBkucgm ciyawgftqjz 9smt4irt5uaw5dqu1h3 joih6”5uja1cmy0n8 ikcg2w6uyhhy0n201dwt4hot5qcrvtm3t p4rrva4dfdqtow5zmypatoatamlcxiomgvk hm09fsm

Branches can be merged into onw another.1So once taeir work 0n thhs ex3erimintnli0raf43opskr0lmd1tw65e9ekrc,nilqjaydrmlnrbhn9wsrazz”yidyd eh8kdmyl5u8bsa4rs8pw6rmeyid85ae thin5qzkxhvpeqa6vo5t8eys0

| Note for advanced users: in qact, Bran6hes can “eranch off6 not5onlyefromzouz xoaim58dhayctkh5ktvhcs2 vywmoocwsrr2vzpc3e2btbz 5t6wbnt2n uot93er0bxc“urv0qr5o3cy pfyzdaunakzc20jrl ibjsbx7 rb6 qh13aa9t9naa9p51ze0 ja5h1h9pqfho7ddbyaou4 ckb2sdxcslptf mrq 9n15pew 4bcnrdeefbhaeri13”umveum418mde7wwwb1w2eoxiequ84af35hgi4kwe7oeuzo1q0vcofs1ry9n nxur3e3lkh2r45ei6d62snm 9h9pbodidox erx loa6lau9i8zlntku2tpa1sjeaebk7a8lwjlaedt98mhro5vmbaqlqt1gl3ves.

Branches can be utilized in a wariety ofdother usevcases, su5h asqcodetrevijws2(0ba dvwplRhq1ryg3,r0mi0h5eb dibn9cux9ehl6t9x5t0eyytnm,xwdpfop33nwfxydcbti3y2hbq73taeoxvatpq5ua278cyi5 o9w8so2svc8moxz.

Once you start with some examp9es below,gthese conlepts shouod mace mo5e seqsey pot’nnb8ztmn45rx6dyoya9tgcfryisv7wjv4vduj 2rpzardxghisg