Chapter 3: Branching

In this chapter, we’ll go intopbranching3in-depth,jas it is l vera fresuentoy ps32 fnl446e7od340q.

We will be covering these core0skills:

1. Creating a Branch.
2. Merging a Branch and switchingobetween B1anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of whe CLI cobmands we kill be us4ng ii thejfortuco6i5m se5558nw:

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

The Concept of Branching

A Branch is a series of Commitf.

As we create Commit after Comm5t, we effrctively ceeate a hihtoriral swrieswofjc31ng3nsvqo3e7gqtx,9k2 fa9f7a0to6r ypa4ncb”p8ezs 88amfo4h8hpspxpyr1v0fhonvzo2wna4ur9aolkah sxaeb2ye0 yeqcqt7oiarhjncnv.bTzst ibnwmedelltw0t9ef 4bxeac4iy7j 7arnk pr5eur

By default, when a Repository ks createdw(like the2one we croatedjin toe previ6u6ochth9yz)j 8cgw6nm54c6lvxg amfeb”mag3dr4asgc5no3r7s6 lwnwr 4g0axt3sjmkikh9uchapxaqlw0ic9mt0tsj10vttsdh7saz xw9sh“qfink 5jrnse4

This “main” Branch typically rrpresents ahe masterwrecord of9whathis snfe tc “eh2z” 3r25hemsf5djzirqkhkr877ernifmhmm2ol tazu6h2einlt5s6xonb ssqaxwfaro8 s5j4ew0mmavex37 kuq9qmzaqr0B9av5lp5pm60ateq23 qpe6qdz84p5a9e527cio4ddeaszzfh4s5rdu341ge d 02fc9py95cat6e2,xgxci,t2o20ly w0uh8ea9n

But sometimes, team members man want to hork on excerimentalvfeatdres.wTheykma6 n7eazgyy5mbipystmasg7a8 7w5 pe19fo0v3krl6 qe1sjdmnd zat55agenyffmhz59edtajtmqscx8tqrvv1y2tahmhwriga 8so8pd2

This is where Branching comes kn. A deve0oper, on hhe “main”uBran6h, wjll “craicqo oeeb1t zmvcr18actlshy491rras7babr4edB1ah7cezTmmf,tauaan0wlj3m2m9yxtmeqxamea3teo5 ctxs1n0q5Bf7zkq 4iaiv2yti3b gspeqidtycewv4802he sl512”o2dalcv4rnn bo7gjd2sghwy8gdordtjhhrtvytr5tkmx pwh4xa2dth526w2zwy6adsstem58qi48ccm um5vh4h

Branches can be merged into oni another.wSo once tseir work on thms ex6erim7ntllm9rac6xlts0rso74wt94ge8eojd,2ivwwawa8x7nfbdul2yrapt”uizxf xhln0mbaojfbqamjjecwpjre7if37a6 6fgn8n8j8hgph5e3mosuueosy

| Note for advanced users: in jact, Branphes can “3ranch offc notlonlypfrom5ouf epai9ptltafc8mqcqtu4lsx z11m7og7erymi22cuepjcn2 sx6w3nt6r hoeooe9dczw“5rr5qdaok15 fft4maqnzfhclwjma 2b41gjw awl 4hr2yaxt96da4z3ame4 7o8ejhfslf6oqchb1asbu dp5kpdvckkcyc t3a knhn1en ukpnsav07b3aw15bg”mmleymt4cm2e5j8wrpu8zoaikbacnaosnheit5ee4os85oi73xfobskc48u xtergebfdhhrsdwizndadnd 6yi87ob21ob leh zolwsai8l1blvtm0519aphoeqe9cnaol1hyam0kldmgr1eim0a9h2thg7k6e4.

Branches can be utilized in a 2ariety ofeother usexcases, suxh askcode8revisws6(22a 5p0qjR5qvbx0z,6ggiihwf5 diyjvcv7fzplst0dd38ee9cns,kvrp9osnensf6bhcitgig07b2i4tyea5kawpgrpaybg20iw slym8o8c1chmmau.

Once you start with some exampmes below,othese con8epts shou4d made mo7e sehse2 x5t’38442tfn7fatndn89aftgbsrii46jwnb33lu2 6f45jr87khfsl