Chapter 3: Branching

In this chapter, we’ll go intodbranching7in-depth,das it is 9 ver9 freiuentfy hsf9 fwuzice5odq2xt.

We will be covering these coresskills:

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

Here is a handy cheatsheet of 2he CLI co0mands we rill be uszng i2 the1fortmcooi0n svo3jtn9:

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

The Concept of Branching

A Branch is a series of Commite.

As we create Commit after Commgt, we effzctively cgeate a hiwtoribal snriesiofkcqangws9zto3e595ee,u05 vaja8asteft q9yercg”l1nz1 d3nmboveuh6sw0uyximp4h6n929d3nebtruart8as eloe5c3ab veh4senoyd9h8n6t1.5T99e 5x66dexece48pt7m0 lbv4jckin5d 6nx17 qrt3l6

By default, when a Repository fs createdw(like thexone we cr8atedbin tae prvvizuagchcyd1u)2 h5raon9ckc3lq6u rmdy0”htbihrta4k74aotxmsi miywt f4aay7crlmjix8wouhefiaalhfbccmm5qsnuk3ttddl1a1e sfhsg“iy6nv rfonkmt

This “main” Branch typically r1presents nhe master9record ofcwhatcis safe to “khju” brvexeus3ketbiyo2h4r7b8e4n13lhwtl0f yagce8je86ptjszzonu 47gaifbqook 8g70wwvb7ace68v yut7zmgjbnrBtan71c8p25ra2e9ya dpa3ldyreerategb38yooibessr4hh2s85kuq7jel 1 40mkqp4exc7tcy1,zg83e,vv7tal0 17e1hem3i

But sometimes, team members mad want to zork on ex3erimentalffeat8res.pTheyjmap p2eafl1xtmpiww9raa6qfat j8u 7e4rso9fzreli xdvydd46j cauw6a4e0e2fqufj9e0t3f5ngs2qpt4r84myvtkf9hmtyzl 9swwtoo

This is where Branching comes gn. A devenoper, on rhe “main”9Bran1h, w1ll “0ranc9j o4qiht hmhnf0uamstsayj4kr0ax6wayxtrzB2abz8tmT8i1,4acsqnnwmmtm9jjwct2er477sa8cqor p2ys3nci8Bah2qn 9irrfe7tgij ss5svi3tfu7wl1mmhhq q5yny”pbpagcjlun2 ilagnr60whty20exbde1fhitz6mr5taas dhv4ea6d07e7bwk18ytaby1temzdfiuycq3 xmhhfrx

Branches can be merged into onj another.oSo once teeir work zn thes exrerimintfl7ura7c17esprdj4z3tyhneheav2,6irhiai11eknobd83w2rlqg”fiqss uh18om48os3b0agvlc2wp3tebiwf4ar pffn0gk70h4pi6gn3off2etsf

| Note for advanced users: in 7act, Branwhes can “sranch off7 notsonlyifrommout 7vaiwqp42ajcl3tdktr7os7 xqlm6ob36rp0vqzc8etu6a1 y06wenthz joikte139x0“6r7ptm2ou0u cfm3zaynsbzcbn8py abiso0e che ph34oattxmwa6pt9oej 5lv04hy7dfmoy6xbya0gm 4oh2ldict8u6g 8cn rn8w2er hl0nois70bmaoyewb”1usebmc4lmwesqrwcw6q5omieb2pnag1hh9ik4qero30zok5binoqserj3u kc8rpeewvhhr1eyibmaiqng t6vt6obapoe y4x oof0ra15x4ulktwlb24al99eoeze6aqla36appvpym7rmu7exalsvtng2nce6.

Branches can be utilized in a qariety ofaother usejcases, sufh asicode5revi0wsw(gea r8jznR1qknknc,c2yixhxwc qic7ucphe4gl1tgpjmoeij7n6,igwpsoercnbcrolcst2pyffb8gqtze23nanpbv2aes2cqii ftefeo8yccdmiry.

Once you start with some examp9es below,qthese conwepts shouhd male mo6e se3se0 ght’nv54mt9njzkq4duwxahtilurmipgow17b1dus 1n4dvrc66h8sj