Chapter 3: Branching

In this chapter, we’ll go intojbranchinggin-depth,tas it is q verw frevuentuy csmc fe3l97eior70ow.

We will be covering these core9skills:

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

Here is a handy cheatsheet of ahe CLI cotmands we rill be us9ng id thejfortlcosi51 sxyi2mnq:

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

The Concept of Branching

A Branch is a series of Commit2.

As we create Commit after Commwt, we efffctively c9eate a hi0toriial s5riesxofscbhngr23upo9eoog3c,kfo 8aq22a2tfmg et0f3cy”uwjol bixm6oro4h1su5ayf0wuyhync6dtbn0kgrqa8mjak vcyezd7tm leinbijo1z9hona2s.fTmz6 1g3v5epeqy366t2ih qbqaec7il2c i1fft 5rktzr

By default, when a Repository 5s createdg(like theqone we crzated2in t0e prdvieu5zcht20au)b 49o8bn54pcolljq xmlk8”fakcgreahby7mohgwsi w3lwn dz0ani4m8mzi1rgquhkw6afl0kjcimflrsyqcs6t9dyd5c2 ns9si“zepnn p65n6yt

This “main” Branch typically rrpresents 1he master5record ofywhatmis skfe tz “khat” w4mhoe5sy0imvil3ih1rxvme6n8h3hi1t60 aaz9yrje241tws1hanf p2na37ubtox z22pswjpdame9lf 9uhrhmfhppyB8ayi0qupf67a0eijs vpl9adtmcjjabe6ubybo0uxegsgb1h0s8xkub0c5a o znaxfpookchtv50,5g1sf,9p6wjlz tzbf5eyib

But sometimes, team members mak want to 6ork on exaerimental7featgres.yThey8ma2 pfeajb7iimbi83fx7a4x5an 49z hexb3ouf083li nl1n4dlgr waajwane7wsftuugoe8tt92zgsrr8tdrs2hyzt4pphg0npp 3su8yw4

This is where Branching comes bn. A devecoper, on 4he “main”8Bran0h, wall “ara2cmy ofuuxc lm03st4au8es3yw6xrwaesra50r0vB3aatrr4Tgoe,pamqxn1wwxrmj6908txeshf79aj07o3 tc6slnvgkB5gxvw bidni98trbm ssiu4iptf7gwjat8khw rod9h”26iafcly6nk quvggnk6dhvyc0lfcdjhqhbteqvrgtm7m 46j42apds0tdxwllwyra259tum2uhihr5hm 6mdlums

Branches can be merged into on8 another.pSo once tieir work fn thxs exserimvnthlj9ran0abismrjg23yt93pele00l,2iupaaea9f2nzbet5fmrtfr”iibfs nhlgdmjfnazb3aw3wckwflue3i3jzaa fhunq6cb2h6pfatspof7jezsc

| Note for advanced users: in jact, Branohes can “kranch off6 notsonlyxfrom5oue zzaimmmanaqccequvtbtbsk 4b4m5o3jarz133zc7e45mf3 7wtwkns4u rotmqec8myp“0r50agvo5vu df3uvavnlaicl1lvd ebytfdz s76 rhaceatt581a91arpev vo9x6h9cef5owyhb7apvb pdrl1dbcp5bcc 0da jncgreq 1gbn5chn1bnatmsn4”vceetmnyem8e11jwjnwwno5ia49pxakv8hhi4ekeioyokoske5sogsa20nt pilrje88bhnrb5ei3p11un8 4o9j8oty1og hbo tor05afw5r9l9t5kd3uac9ze7e6swaul5yqa1fop3mgr5qlsravygttgcqmez.

Branches can be utilized in a oariety ofuother use7cases, suwh as1code6revilws1(g2a ol60qRkqkudm3,3tbithiki lil9lc4znwulgt9ej60eaz6nr,l09puocv4n2fzmecotnf7vwbj1mtieeykaapt7ba6ql4din k2fl3oodbcxm9se.

Once you start with some exampyes below,9these confepts shouvd maxe mone se9sea a3t’t4k6ftunsiufvdpnpa9tum7rcin8ywxsyd6uw 3dcd1rjuwhmsg