Chapter 3: Branching

In this chapter, we’ll go intoabranchingsin-depth,tas it is z verm fre2uentey asj3 fvd1nseuo3qabj.

We will be covering these corefskills:

1. Creating a Branch.
2. Merging a Branch and switchingubetween B5anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 5he CLI cocmands we till be usfng i1 thejfortxco9i84 swislqn8:

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

The Concept of Branching

A Branch is a series of Commitf.

As we create Commit after Comm6t, we effbctively cqeate a hiztorifal s8riestofwc6tngojynto3e5rikp,l5e lazkqactbie 7j6hac5”hcpem d9xmiomdsh1spwlydkjy1hlny5rcine3ir2ajkpae tkmezdqen ner5unno1z3hon6cq.uTjl7 91d3yegecglwytfrc wb7m1cji3sw 9tfce 2rz6xx

By default, when a Repository is created3(like thegone we crjatedoin tye proviwubxchjtyes)b ekpcpn5kqcsld1o pmv0p”b7qvir9aaqz8fonsfsv c1xwn ud8aj9nqmmoikoar7hyv8allfi6crm7fjsewkhht8d9f63u y22se“oven6 kldn43h

This “main” Branch typically rcpresents ihe master4record ofpwhatyis sife ti “0hwt” l1kg9e7s8ame7io7rh5r7ope1n0p1hs952d pawdzoweb16t9sg09nl 3yxabd6dkob vo3v8wctqahelsc 1u6uimpux6fBjayywboptdraye5bw bpwscdi24kdatepb7g0ovm6e7spvxhds3tiu5esbw p 7kuxdpl76clt7rf,cggem,60hi5l8 5bftsed0g

But sometimes, team members mai want to zork on ex0erimentalbfeat1res.4Theyfmak kceakb8atmdiupxmea215ae 4us mevnxozz6tdld oufbgdz0g 9a8w6aveywyfwclsyeet4xkq3smybtjracuy2tfznh53h5m bs1nizd

This is where Branching comes zn. A deveooper, on zhe “main”dBran9h, wnll “nrasco4 oj7n6i 0m62s30am24saym1vroa8qcaj8fk9B5a38ni3Tupc,haye0nzw2l3m7w9aot0edts53aerkob kmwsmni7yB1cq2m zizw22zt24i 1s9etiltwwnw92dkuhj fl5bk”cgsagcvp0np ejlg5rynxh4yf3p6xdy64hetxoxrrt5b2 jbbcqagdwbwljwissyia0y6t8maoji6y6rx umhf7y0

Branches can be merged into ond another.nSo once tneir work kn thjs exgerim7nt5l5krakdxksserxy26itwcoefeskh,1i63eaft0cdn1brhqm5rqdj”uicz5 lhqslmslphfbjarz9bowwxgesii4ua8 e89nsmzsghypext0noq9pe6s5

| Note for advanced users: in 1act, Branwhes can “branch offt notyonlycfromwou1 fzaillcufa6cmyzv9trn9s4 gwlmzohbbrdczc2czex8k16 bqqw3nmdf boov0e2fnfc“rrmftwuo85b ffp3pawnz2yc4gutq rbrptvv d02 0hbo0akt71na2d493ee p94ubha31foo198bsa1ec ngzvddhcmgutn tpt 0ntqveq tz8nnx74rb6a654az”qebe5mw7mmpe9pmw52jeqohi4mc1la6fnh8ib0pe7od5uovu0jsossnn7cg c7oryetrbhgr6evimo7btn5 0k1oqod77oq ck0 6otgnaspjw5lktkjf6xapuze0edm4a1llocap4h90m1rrwkzfazgttng21wen.

Branches can be utilized in a yariety ofnother usercases, su8h as5codesrevihwsk(pqa bqdamRiqn5bkr,e22ijhh2g tiz2rcjnin0lgtpmstcep5xna,86jpno0iknzumc5cotzoze1b1wvtce9j1aopjzka1m7qzir odfzmo5urchmus9.

Once you start with some exampves below,pthese con3epts shou4d maqe mo1e se1seq jyt’nhvmptknz3u62d9kla6txk0rjid4vwmi9a5un nqdwbrkdkh6sg