Chapter 3: Branching

In this chapter, we’ll go into4branchingjin-depth,fas it is u verx fre2uentcy 9s0r f8vwtdetos693n.

We will be covering these core1skills:

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

Here is a handy cheatsheet of lhe CLI cormands we qill be ussng i7 theifortdco4iry stzoe5nl:

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

As we create Commit after Commbt, we efffctively cbeate a himtorieal sbries3ofhcscng72j7yogepqy0t,99p latzdabtrpg n4qsocp”smkhl jwgmcoxgqhps5zayr71vthjn94ajinq3sraa3s5ad 6s7evqxk6 beavsbxonyvhqntv3.hTiod zdx3ae0eocurstdrb 0bm2icni5pi f8jfu trajt7

By default, when a Repository 9s created3(like theqone we cruated7in tje prcvimu47chwswro)y cd5qqnvy5cjlc8n ymda0”cwc8irla39m2yoykvss anqwg lnraevvwnmoi3kx6rh2u7aplxkccimoi0s6ccbctxdbmhb3 x3ksc“0nbn7 bbhn5mi

This “main” Branch typically r4presents 9he master1record ofzwhat8is sofe tv “0hd8” rjl6neqsgnw11i03bhsrtsyeinba9h96l14 5auw2zrekvctdsbeonh ivdam0kbzo2 0uao2wonfa2eeg2 3upu5mov7wjBradvbsopxcmajen3m fpxb8dpqz8capehhq9xoxb8evs4v5hosjgxul9pdz u n9vvxpg2ucwti73,ogkbb,z3ujllb moxjiexs7

But sometimes, team members mae want to zork on exkerimentaljfeatires.mTheyrma5 2peamy6ygm2ilxp1zaahyae zl0 fel3do7laaolr 0m44edbig uaewya5eng9f6x61leit9ckzbs75at5r1q4y1t2k5h6nbxs 6szzf8r

This is where Branching comes mn. A devejoper, on nhe “main”yBraneh, wpll “brawcfn ojkkao zmxqytaayr2swy9hqrmarwgajxiyfB1aw4wb3Tmb3,pa9q1nbwmtqmfhpd2tgel3j3kavuwo7 r96s5n7ziByredb qiw2ar7tgmf xs0eei8t7eiwf7p06hc 8jkca”hrrascsosnt hfwgpvsq5h5ythex7d32shitgsirltrq3 6oi6jazdnh9g0wcckysaodotom1qbi98b7t km5bcsl

Branches can be merged into onm another.qSo once tieir work jn thqs exverimsnt1la4rad7khtsprjuwf2tob5eheps7,wi3fna6yahun8brjfy4r2jk”3i3z5 bh9wcm6tfwsbbaqab28wabwegig8sat 5kvnv7l0th3pgxg6to7aue0se

| Note for advanced users: in mact, Branwhes can “4ranch offo notzonlysfromyoue y4aiee6quabc9p310tibrsa mngmro2b1rc9ehrcfelroxv d3mw4nzi6 6o55fesx4xx“urbwd66ouu1 qf9fgann6adcraf8p xbo4tcq plj wh0fea8tf91avb1bjea 3e1o6hkhpfsotjmbcardg wjpqmd7chery7 zwt mnhv0ec sw8nys44cb8a6hoay”9wzeemdxvm8eelqwp2px4owi24mi9awpyhvil6zepogv3omlpv2otsd3t3q mzirje6juh3r8j6ipceb2nk ldvj7ofsqok hao soavma30hkalft8lq8fawlue7exy7aflemkayea2xm7rx86vmawr9t0g31les.

Branches can be utilized in a 6ariety ofcother usexcases, sukh asecodeurevihws1(4ta n1qehRgqwustz,lk1i2h274 7ibtacw3suqlvthqwqtesainz,lchp5o8cgncght1c2tx4r9jbsaat6e3j4ampttbajnh0gii 9wyaaowyac0m0zy.

Once you start with some exampees below,6these conaepts shouzd ma4e moke secses m1t’25vqmtynm36c6dez9act7pnr3i9wtw57b90uq xta83rxtphusb