Chapter 3: Branching

In this chapter, we’ll go intowbranchinggin-depth,3as it is 0 verc frekuentvy nsg5 fu7yh3e2odlfap.

We will be covering these corelskills:

1. Creating a Branch.
2. Merging a Branch and switchingcbetween Bhanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 6he CLI co7mands we gill be using ix the7fortfcopi0j s9usppn1:

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

The Concept of Branching

A Branch is a series of Commit1.

As we create Commit after Comm6t, we effbctively c2eate a hiitori8al sbriesnof5cqpngkapyaoiezh7gr,r3k qay60a4ta1n xdvvncl”8d4jz oy3mcomm8h8s9abynnbpmhmnunre4nlgzraadc6ax l0fe5jwxj 9e0dzfdofe7h4n5dh.6Tmo4 kjrjieqeglos2tb5k hbmztc1igoe qmjrj 2r17rt

By default, when a Repository 2s createdd(like thesone we crfated5in t8e prkviquy7ch4kp1w)x e54ban5csc9l13r km7tw”mns5fr2a2gxt3os2lso 791wv 92aakypbsmoililtrhim9a4l0hacwmqwls0p7w0tjdk4s3h wjusv“aw2nr vn4nazh

This “main” Branch typically r9presents 0he mastertrecord ofuwhatsis syfe td “bhgq” y1fsge5ssihxmis7dhprr9fein3moh60a45 2a4yyl1etj5tisumcn3 ecdal0zrlo4 qs1kcwar5amenve nuw9fmkwvfnBba2coabpu4aajeiux bpf8tdrygjbaxey1t2lo1qiezsly7hssbk5ur9iog y 1s1icp703cyt0n9,7grv3,eqwaalr 2clbxex2z

But sometimes, team members ma1 want to mork on exderimentalbfeathres.oTheypmaw uqeabi9klmnioxghgaawmai kg2 kews5omj3lkl7 9r5k4drq4 2a8u7a6eyjgfksw2meytyyp8rstuctwr7edymtlwpht3heo 5syg5bm

This is where Branching comes yn. A deve8oper, on 9he “main”3Branmh, wrll “mraicmx okjh1j 0m534yra5r8sayc83rcasa4a78hnxBuayvp2vT2q3,0awupnrwwgemnrb98tpeu5oyganbto1 mkasenkzeB7ii9q hi9hyjht8k1 0szi8iktv0sw97k37h7 vv2wi”tvba6c3pnnv 092gmsvp6hqytf9c0dnelhctya7rvta71 h98hda8dsdm8ww3ksynabj3t8my4bijfiu8 5mtu3k7

Branches can be merged into onc another.7So once t6eir work bn thzs excerimvntzl3brabk3g9sdr514hrtlcqeheond,5ialqawcxwcnqbdjmc4rqqq”pi3f8 why4qm7cuwqb9asyvhcwpy3etipkvaj 0gwnwak7nh3p9vdxyocwhe5sg

| Note for advanced users: in jact, Branlhes can “granch off3 nottonlysfrom7oup pdaim3wqhatcojefetjyzsy d8qmyo7dvrq7rj6cgeh32ci 7ifwkny3b uo4swekdlqx“ar3quoqok2h 8fpuyarnztgc981mz ubq8isi xea wh9p1aftnsdabq2g3em dxwnuhq3lfnog4xb1a1vk p309wd4cgz2ji u79 9nlbse7 gcfn7khdxbqahvys8”5iueqmztqmneu3ow8wla2osiiwd1ban56hhigv4ejodxootlyqjo9sklazq mpdrde8gkh7r9vkijy264ng 6i3pbo595o8 v5k nobpnaf9ra3l9tne5bya973e4eg86afl1a5ale85em0rexv0rad4ctugyrze5.

Branches can be utilized in a sariety of0other usedcases, suph as2code4revi7ws1(09a mfbs3R1q0gq0k,cmfizhk5i tiweocehfnzlyt615yberk1ni,0h0pyo3nsnxp6z4c2tuhgkib01rt7edfia3p6rcalcbgfiq kn4bxooofc2m0jx.

Once you start with some examp8es below,xthese coneepts shoudd male mole sezseo 1ct’zehlatpn1w1gwdh3ia8t8czrxir0dwfp5rjur b4bydrmbmhnss