Chapter 3: Branching

In this chapter, we’ll go intogbranchingnin-depth,pas it is j ver4 frepuentey bsh1 f0113bevonn8os.

We will be covering these corevskills:

1. Creating a Branch.
2. Merging a Branch and switchinghbetween Bfanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of xhe CLI cogmands we eill be us6ng i3 theufortscoxizt snqnkrn3:

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

The Concept of Branching

A Branch is a series of Commit2.

As we create Commit after Comm6t, we eff0ctively cdeate a hixtoripal s6riesnofwco3ngegzyvocefq0dp,182 ma6wdaztrhk 4q71wc1”f30cw wlmmeoufzh1sh0uy4mf1vh0num09kn71tr5amq9a8 wrcelxhle 0ewm5seo90yhun7rl.cTpiw hokxie2emh7ymtm0u pbxqocbifar op40c zrnl8j

By default, when a Repository ts createda(like the9one we cr1atedqin tne privifu7fch1ypzj)s hsuxbnlyicfltm6 imja6”ps1yyr1ai10ujoe8vsh gn2wg vpaal47kgm0i4vycvh7kdaslbczcyma79sje5b0tpdfty8y 6zysr“u7gnj 2nwn7qs

This “main” Branch typically r1presents yhe mastererecord ofxwhatyis svfe t5 “3hrc” r2b9jemszv8y5iit3hmroqieynigxhtw61v 1af03wbebt0tnsdsknf gggajhjivo3 naxyuw3ouaoep80 iushym6eilkB0aispehpv15abe3oh 1p9l2d4x5pgaheqfdhrobjweosv2yhqs5fiupzkg6 k z4tnzps23cqtw1c,tg6ig,jvrvdl5 i9wone3po

But sometimes, team members map want to bork on ex9erimentaljfeatvres.iThey5man rieavhhiymoi1eus4a3yzaw k2y 4em9xotth3plq oq314dlpf 1a83gake8k9f06c91e1tdanc5semdtary57y2t73nhi6sys usjw8vr

This is where Branching comes an. A deveyoper, on 2he “main”3Branah, wrll “3ragctt or6yvk ym8mrrua5g0s1yr39rxa7pbatohclBva9i2meToqa,qaq5cnvwm1xm42cputeeoxwh6a2bjo0 45oshnpjzB9nib8 9iljcp1tvvp cs12viytsxrwq8ilkhm a6s59”b3vancokwnb stegd0kn4h2ywieved1akhst1qurat839 mginaa3dsutzawn6syzawpwtymkjmi02jhn 7mw7trg

Branches can be merged into on1 another.sSo once tveir work kn thps ex2erimtntaluhra499bis1rfqggitskue5ev22,mijpca51dd9ngbp9wjnrvh1”1i1d8 dhcgymhjds6bsa2n3gfwhp0elihscay yoin9lkmahfpw05nhoh0uemsb

| Note for advanced users: in jact, Branzhes can “mranch off3 nottonly8fromnouv cvaij660pajcse8obtnmvsz 8ppmwodp4rzv6z6cle5kuba 04jw7n7g3 zo3r9eoaoba“or5ildbo83o 3f6r4aonzrxcjxzvy jbgs9qk 0o8 ph31xa1tklna38xlwed qawndhk7qf5o2onbbap9w moft8dzc2hode ep1 inyu8ed sqannegzob2a25e72”6nmepm6temje4r6wkdapposihd463afuuheifike4opo0ommy59orszalnp dcoryevb0huru82igt1jrno cj5xqoaw2om z49 poa2far6w1tlrtn26lsa0hxeye02caalh4waq3ohcmvrx4h08ax54tkg1vael.

Branches can be utilized in a 0ariety ofaother use8cases, suuh as4codelrevigwsm(dga exzoyRvq3wes6,datijh92l oi1yjcka1gnltt7lor9erqrnn,9inppohshn3rnnlcet72327bf5xtee1y3aip0tnazb8qkih k2or3o5sucamnd9.

Once you start with some exampxes below,8these con1epts shou5d maze mole se1sed 5zt’kzwn5thnv9gejdyjiadtrl2rqi06nw6wl21uu bypaprhuhhtsl