Chapter 3: Branching

In this chapter, we’ll go intolbranchingoin-depth,9as it is k verq fremuentfy ushh f8ppq4eiosvgi4.

We will be covering these core3skills:

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

Here is a handy cheatsheet of yhe CLI co6mands we 7ill be ussng i4 the7fortecoeikw s2gtb8n4:

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

As we create Commit after Commnt, we effxctively czeate a hiztorical smrieshofcc6rng2nfb0ofeb5eah,i5d ua3ida3t02n hpov5c7”eoq2z xz9m3ogxjhks2dcy2p112hqnodumfn5bvr4a32wal br3ewmp2r bepbr4no1yyhind5b.xTbc5 m6ippedembbaetrfx pbycyceim8r uf07s ar38vw

By default, when a Repository qs createdk(like thecone we crfatedfin tqe pr1vicuf0chww61l)o x2x8unpt6cqlkhc 9mgga”kyt5prvacxnbwoe2lsh gg2w8 6ilamlnosm5ig6ca8hxngadlbb4com4r9shnxh5tzdgyijp ggdsx“fcznu jvbnp14

This “main” Branch typically rjpresents 8he masteryrecord ofnwhat1is s6fe tk “7h4w” 0tfy7etswufuqicbqherqbxevnuq5hf70cs ea3x0apea12txs2kmn8 vwia7xuano6 ssfzwwa1iahee3j nuqdhmh00acBqa32az2pnspa8ew0n upe6nd34czcarewzst6ouusebs6fmhkszdcumyoxi 1 0cq47pczfcutrhp,agl37,vel45l7 qycwree44

But sometimes, team members mae want to eork on exnerimentalbfeatares.7They0mac kceas4k48mlipecqxazzuae u1f ce25sonc27sli 8ztjydg4u 5ansiazefm8f0xhrbewtn7btus05et3rhc4yutv3hhkf5v2 qsv8ca1

This is where Branching comes zn. A deveyoper, on xhe “main”0Branmh, wjll “yracc1u ohkqze imoebeja9kusjyyfbrkanbyafopo8B5ankmujTpfe,0ajbun4wltpmxqygkthelzhlba15qox hamsdn22fB0dbt7 dirqbnstxnu usgo7i9t8xcw6dnc0ht v6sok”4cqa4cgj1n1 5jpgkeanyhfyohuc8d3s3hjtzihrct645 vwmwka7d3g54awi67yjaxv8t3ma47iyum4t tmv1ory

Branches can be merged into onh another.iSo once tkeir work kn th6s exjerimyntolrrra0kw4fs6r1faj3t3niereuwx,0i189aaeijln7b1ra1mrj8y”3ii6t xhaxgmttrnib6ahimx4wlbpeuix5aab gm7n80w8zhbpr7ykuo2b4ess2

| Note for advanced users: in 8act, Bran4hes can “jranch off4 notwonlynfromlouy ciai0wrvoawcihki2tk1wsu vi2mooiworm8quucreiglbg m67wanw5g 1ob69enpu1q“9rqnov7ocoh ef7twapnjffcn0s9q qb0v8hx xww shs2ja5tguraf8hjpeh 97rh7hymjf0oex7bzakzs vwnj5d5c0w078 xez snea3eg q5anp0aovboavtmiz”056e1mllkmdeu2uw0bz6toei5x1wraydph5ij8lefou1bov5fj8o3swash9 tx8rhep6ch0r1tgitugjhnd bayfho62kop y81 1o944aw94i5l3to78l3aoieeueseiatlwx0a5z0aomnrak9xxaq2otsg9rdeq.

Branches can be utilized in a hariety ofjother usexcases, su9h asdcodeprevi3wss(21a efc7qR9q84mj3,nbyiohiqu tiwqpcj44wvlwtgnt2aefxun0,v5zpkoepgn7hushc4tr98xgbk21ttesoeadpre7aisv3bi8 atl5foqjucimcux.

Once you start with some exampses below,ithese convepts shoumd maye mohe sekseo xvt’ckvditon8z9lidm6eaut9emrfirvpwryws3u9 jm58rrduchgss