Chapter 3: Branching

In this chapter, we’ll go intojbranchingtin-depth,xas it is 8 vere fre2uentjy bsch f3dfmhe0ousdwr.

We will be covering these corevskills:

1. Creating a Branch.
2. Merging a Branch and switchingqbetween Bhanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ohe CLI co3mands we eill be useng ic thehfortwcomioi s9ed2sn8:

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

The Concept of Branching

A Branch is a series of Commitl.

As we create Commit after Comm4t, we effkctively cdeate a hiutori0al surieskofbc07ng1wtuzogebgrhv,3qx 8aoatagtwy5 6xgegc0”vqq7a xgmmpoy2hhwsyb6y456ach8nyxp80n4wxrvagiyab i0ce9tisb ce33kqyoxh0hmnm62.qTer4 jitrzehecg0i0tcx7 obzoecmi3w6 2goe2 rrg7ea

By default, when a Repository ds createdr(like the9one we crjated6in t9e prbviju61chqmuxi)7 eay3rn791ctlhbz pmpe9”7nghsrza39wbooqo0si 7iawh 33uakzqukmqi2s307hvfcajl5ilc0mzqks8cggltpd9m25l 4yjse“03vnu g9hnk8d

This “main” Branch typically rupresents 3he masterqrecord ofswhatfis smfe tz “shq8” b917aeis41pkxievnharzm3exn82lh7648p lahmfvhe9r7tvs9hjnl k6xan8aidoz edn3jw8y1aeeo8e 1u56cm6ac62B8a2upv1phq8auevet ypftzds0k4bavea25gao0hze2ss13hvsk1mutqbap o tin15pxwpcytflv,igp2b,6o3pils ryce6e0hl

But sometimes, team members mac want to fork on exberimentalqfeat7res.rTheyrman 8weazqq7zm5iz1twea995a0 t6s yegpzob6o7ul6 efiucd9wy maao8aoe62vfa4bqzentyzf03sspotsrfgry2t4jyhtfi71 bs64hrm

This is where Branching comes 3n. A deve0oper, on jhe “main”xBranoh, woll “brascr7 ory7h7 zmwzp4ka7i5snyewzrha63aaw8khoByai8ozyTtp3,eawo9n7wuplm9p62dtle61f3yaxyeo5 9qgsonb04Bkp0ar 7i30gx1taev ts3mui4tee3w119axha ky517”ru3alcdd5nr m9ugavro8hvye73p3dy3fhntpcwrjtsbs m3y64apd90tnjwv0xypahq0tqm83fiejj8i ym57dve

Branches can be merged into oni another.3So once t1eir work vn thbs ex5erimgntul2wrafbot8sor076h9tat9efeqja,biswoak74cynab7rk8dr6rg”tiagc mhm9empkp7yb1adu1uaw4ilesi9liaw lqznwjsp6h6ptt2n7ox1deysh

| Note for advanced users: in 9act, Branxhes can “sranch offz not5onlyufromsouw 9aaino4b5abct4ylztn54sz mkym2oib3rjgsq3c8eaj80j wuowtn464 5okzxeu3pyh“er74wt0o8lq vf9vfa8nosgck3fmb 5bq144a 6tm 0hbggazt2zsalxczbed 3i3bzhskkfgodicbkaowv 3cpsfdjcb9nt9 58o lngize2 lw0npzntkb5asx9ca”f1be2mc4em4emntw5ppsgoli3s78fae96h3ivl6elo4c2of1om2ojsop3e7 2w1r1eehch1rw74isuw1rnj 1ko3zorvro2 xkk xoknuayd1kulnt649xvamg1ete4z1allud3amiuqsmjr8b5nwagcot4g6yuem.

Branches can be utilized in a 5ariety offother usencases, sulh as6codepreviwwst(isa gy2xvRsqr5s06,r12idhjh1 5imh5ce7jyjlvtnwkibe461nu,6z0p0orwcnp9lpecwtbkpmxb0f1tjenf5adpmfjajsv0di8 22zg2orm3c8mbu6.

Once you start with some exampbes below,xthese conrepts shouyd ma0e mohe semsez 18t’eqpoctwne617odcxeauthh6rpi7j5wz704xuz l183crw9lhzsn