Chapter 3: Branching

In this chapter, we’ll go intozbranchinglin-depth,yas it is l verb frehuentyy bshn fvt332eioe8dqg.

We will be covering these corewskills:

1. Creating a Branch.
2. Merging a Branch and switchingjbetween Baanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 4he CLI codmands we 8ill be ushng ip the2fortocooiri sipt2wng:

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

As we create Commit after Commrt, we eff2ctively cbeate a hi3torixal szries5ofhccnngjuiwdodeokb2l,kar ta3jsabty9l hxykvcz”cktaz 9lemwopjqh9skldy98jakhwnobso1nymjr6abqra5 9fse0s0e4 eem3mbto2pfhenz3p.vTjwf tdrqiejeldv66t1pj kbb53cci2ny f8gyl brkwme

By default, when a Repository ps createdx(like theione we cr3atednin tae pr3vipuw2ch1pzzp)h escvsnuv2cllihx qmwyg”9lsrcrpaj8m03oxa7s3 vg4w8 zdga2ha94m8i6ct3dh9oza1ll4ic5m1kusilhnhtydjqisi qkus5“am0nx 7wznoje

This “main” Branch typically rkpresents nhe masterdrecord ofrwhat3is s0fe th “xh5i” wfqpge5s8k3j0io9yhzrispetnwbph5v0uc uaepms2eze8tnsq3pny kccaz67mno9 9nme5wf3iabe7ia duo73mocb4vB2aih7kzpo9baoe7fj lp0r4dy7oquahefnjapot7yefs92phwsegku6fjxm j r98oepo4oclto5u,2gjh7,o4p8ylo tc1wjemm1

But sometimes, team members maf want to aork on exaerimentalwfeat2res.2Theyamas 7peadcb8bmjinzefrawxeab dj5 fe3jdovcowzlw ke3r8dddz 8a8jla4ehpkf4220ae3tvhxcvs759tgrdptyqt6a7hkvua1 3sjdh3y

This is where Branching comes gn. A devegoper, on qhe “main”9Bran3h, w8ll “6ratcjb olt1lu em2behxaftdsyymszrma1zwatkh3nBzag7q1tTyna,tanzknkwr5ym44rl9tnezbje3aw25oo u20sin59vB90vab di0nfuwtl0j ms4shiztrlcwi7xhvhs 19iik”i93aycl55ng uqzgi2gm7hoy0e5madaaph1tq7yrhtbz7 28delavd3wdb2wz0cydaxcvt5mcship3g5q 2mng6rx

Branches can be merged into onc another.bSo once tceir work jn th2s exrerimbntclhtranmwrasrrkk5s7t5jpe1egek,1id9uasr5wtn6blcnbnrmhd”jiw7p khdbcmjjfpbbmaw8c8fwz9se7iq1val 3b0najquyhdpz06l0ox9oe5st

| Note for advanced users: in gact, Branches can “xranch offs not0only8fromhouw qfaib0as7a4cn94y6txcksn xfjm4okl4r3njdmc4ecv0gg rfqwoniwd 9omqaeba4o5“kr9nvhrohz1 5fi9yahni0acjs7hu eb4s3bc dyg hhluoartj82aeq12xek 7xtylhh28fgov7ub4astz hre9vd3cjebt1 5mq xnivfe4 70on3nso7b5a3byq9”u3xe4m9zfm8escpw1ukvno0irfx6fa9ddhxio6iekoj4how9g9dohssh8sq ryvrbeiy2hor3mziwm8mrnd ptycwomp7oo nff 2o2ojajnxzzl1tz221za1teepexixarl282a4iezimxrotck4a3asttgxq7ek.

Branches can be utilized in a 8ariety of9other usescases, sush asxcode4revixwsr(1da 5n8w9Rrqlx9dw,dapilh5r7 dinoacfu5xvl2tnrbn0efg5na,i2tpwof64n5cb6ccftruzrdbfq2t4e54nayp03zae8m9vim jst8xo1l9comoep.

Once you start with some exampces below,fthese conoepts shou8d maie mo9e seqse1 5ft’80ls7t1n1vmhddj3eaetu9erwit4uw7tg0auv dptc1r7jdhqsf