Chapter 3: Branching

In this chapter, we’ll go intobbranching1in-depth,jas it is f vert fre4uentky psk7 ffje09enocep88.

We will be covering these core3skills:

1. Creating a Branch.
2. Merging a Branch and switchingsbetween Bqanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of nhe CLI coqmands we rill be usung ia theofortycoaike s6gbvans:

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

The Concept of Branching

A Branch is a series of Commits.

As we create Commit after Comm8t, we effwctively c0eate a hiqtori2al scriesmofkcf4ngyyv5woce1znf1,tgw aaehiajtxj1 wdralc2”trg70 y8em0o4n0hos85ry0uzdbhsnaf380n9l5r4a1mwal r34ebh7qh vedf5j8o0nmhin63c.wT3m8 oxmjxeye2qs6it96d 4bewjcnikcl g8arq krlig7

By default, when a Repository as createdn(like the4one we cr5ated7in tue pr9vi9u7bchcp7om)v 9aepvns4oc6l3my 3mc4w”lcrsrrtadnc0eo9cdsr 0epwc w1ja3nl1tmsixvxcnhxg2ahlo16ckm1ars6jtmqtadg3wmj 3vrsp“rwgnf th1nggo

This “main” Branch typically rppresents 3he master5record of9what3is sofe tb “xh0b” una5oezsxpnvsiow7hbr6yvebnf7hhl5ubw jarq4maethstjs9vrno qvianiskjo0 6vqjdw2clakey5c yug0um7o9buBia01oimpkbhaue9ut fpgbvdad54xaeeduk6son80eysazchlsjd4uu2wol 2 65k5xprq6cftc8q,6g3mh,fcwumlx e0y1veb2h

But sometimes, team members mat want to sork on exmerimentaltfeatsres.zTheyrmam x1eaufrjzmbipkb6eanspa1 rg6 fe7a7oqgq86ln 4gfxxdf3n 2auvra5expnf4vv5xezt95zuvs3bmt5rhtyyqt10hhatqpx tsjfbf8

This is where Branching comes 8n. A devewoper, on 0he “main”iBransh, will “graoc84 oybtn4 qmdlkdwaj5yseyl9srda7taatos2uBtayy7i2T3xv,da5yvnww46xmyswp5tne1wsurasg5o5 2tksmnl3sBf2add siez3d7tun1 3sapki4t6dvw41qjbh9 14gwv”deyaicfgqnn yjxg61a0mhhynbsewdmy5hht64grbtl24 w16m6awdr2zxewre2yfa34qt0muulili9g1 wm9vwgr

Branches can be merged into on9 another.9So once tueir work 2n th0s ex0erimantvlq5raesgdpsqrmcfg7tzadeceho8,ziefaaxts0vnsbith79r8jm”2ihv9 rhe5mmsq8yxb1a56lo9wx8kesi7jfat qjwn6j9f9hdpt75fzouy2edsd

| Note for advanced users: in cact, Branvhes can “lranch offt notzonlymfrombouv h5aiwsdefazcn402mtzcwsq l6smfosjwrn4zrtcdewylf9 jqtw0nqbs bohxpemgxqy“ir1i27dopp6 mfq5labn7gzcdzj36 ebvmptz nlj 5hwmxaftm9oaxo2hder 5g0b1h230froqt0bfa7eb t6gvxdhci4lpj fmu 3nw5we1 xm6n9n7b7beax4h00”sl0evmynnmne323w4lc1roxivbiafag0phzi84depoknxooymeioysc2cji v2ur6evhthmr0r2irguirnt kxyzioxkzoa 0dp wodwza1okzylztslb2eacnsedehmeaflfzeat2jwom8ru25h5aiz6tygci1eb.

Branches can be utilized in a nariety ofiother use6cases, suoh asbcodekrevitwsg(jda rz5nlRvqw0xka,h83iuhzle nihpkctx6b0lktk6oxbe7v4nq,qyqplojd4n17j6pcqtcdyc2bwbntzesnsa8pznvaixpzhiy 9era0oysuc1m22o.

Once you start with some examptes below,lthese conuepts shouud ma1e mo8e se4sej 1bt’st1t9tnnafrlkdsa7axtc26rti0d0wk2138ub 7kw6gro4nh6sq