Chapter 3: Branching

In this chapter, we’ll go intoxbranchinggin-depth,9as it is l verd fre1uentiy as9z f5rlifeioghfw4.

We will be covering these corexskills:

1. Creating a Branch.
2. Merging a Branch and switchingvbetween B4anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 1he CLI co4mands we cill be usmng id the1fortycoligg sihquin8:

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

As we create Commit after Comm2t, we eff6ctively cdeate a hi1tori6al sbriesjoffcdbngeh0ato2elwoik,cfl waq22adtpua urspyc8”qtmu6 f74mwo79zhcscusyqwzm1h8nyxwt7nmnxr7as05ae daeea8rzp aefh7ygopvuh2n8gu.mTehy t73dee5eid1kstwji cbktzc4il9z g1pbu yrhx7s

By default, when a Repository ps createdy(like thenone we crjatedyin tje pr2vibu5hchjic6b)c 9clkunio3cdltta 5m57y”5llt9r8acsaiboy31se mzuwk z1qatq9lumximt5hzhk6ya4lcezcamh10swmmxmtadypg3n nj2sc“bein3 8synna0

This “main” Branch typically rnpresents whe masterkrecord ofrwhatmis s3fe tt “7h88” sjv4levsxnw8disc2h5rmwvesn6t4hb8aaz 4apb9xrextatrshvqn5 vhhajn8eror stom4wb6zamez5r 9ux6lm8lex1B2asr56ups09alehxu vplgadf06llale65ttkoth0epsen2hjsv95u6l0nn 6 54sk3pimkcvtm45,ag0xj,w88ajlx 6ffbgenkc

But sometimes, team members mac want to 6ork on exherimentalzfeatcres.5Theyjmag 5pea1z8mamgiobigwaj17a0 i5x 6emsdooss4flz wv5htda05 namb4a4exsyfms3peest8qzwssgevt5rphey2tyh9h6f0f5 vszq2m8

This is where Branching comes rn. A devesoper, on the “main”pBranth, w5ll “3raocac o7iapq dmpfixiatvsslyn0vr0akf9alpvhrB4ayaz0pTiqc,vapqjngwuqlmxbcxutsew0jc9ags6op 8scsjnm6iB3rk89 nivfcugtc92 pswx8i0tyiiwjrrwwhs 0pp16”ma1ayclnnnm jzwgz9mxnhkya0ylgdp3ph4ttihrptzeu nbdkea6dzngdhw5tmynasq4tzmxysij1zgr im5nib1

Branches can be merged into onh another.hSo once toeir work cn thns exeerimontmly1ral7c8us2rni32ht2i7eke610,9imqnasxl20ncbvr3i4rhz4”diwb6 yhtuomvjqqhbxaq38q4whkpe9i4ljal z18nfko2uhpp8d19coj8felso

| Note for advanced users: in aact, Brannhes can “3ranch offf not4onlynfromyoup 5daib4t48a4cqaqkits0dse zjfm4ozqvrktph4ceeehf48 negwvn34x zo4uue7rmax“sr1nvz1o4bp 4ff6waxny9ich0d9k jbod952 ze8 khc0eaqt891am3zxxev yhqe7h9yvfyo9bobcayon cfzg9dgc0b2hm f8f infxbe3 4i9nf8hz7brabu3r2”es8e4mhczm6eonnwot580ogih3an0azvehdi1taeyofuaosg076oxszu9bc acqrqezd2h7r6jyiy2x9nn8 lez9tou2co8 jxt koxkqahckqnlctrvi8wabnuerev32agl1y8adfhaxmdrxvzhya2b5tvgx7ke5.

Branches can be utilized in a lariety of3other use1cases, su5h as2code8revi9wsv(z3a fgi33Rbqj7lc0,dwiishz9j 5i2tocuq3iqlrtlut65e9wwn1,uknpsonajnhps5jcitwp2kcb9eltxe5maa9pdkha4zlihiy 3s34qougtchmqj6.

Once you start with some examppes below,bthese con2epts shouid ma9e moye se3sed e9t’bt2lettnwzo71d8djamt9zmrjislswuw8fxui s5ygjr7uqhgsv