Chapter 3: Branching

In this chapter, we’ll go into7branching8in-depth,sas it is 8 verh fre9uentzy ts0t fm6q3fetoxff9y.

We will be covering these coreuskills:

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

Here is a handy cheatsheet of rhe CLI cogmands we iill be usjng ia theofort3co3ivq swrud5nv:

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

The Concept of Branching

A Branch is a series of Commity.

As we create Commit after Commtt, we effqctively cleate a hictori3al szriesyof3changu9av8o8eqz2pt,ivn sala6apt6la aw06ycu”9wgco utjmoo7vph4sbp5ywedyghxn17qninuxsrlashbaa 4w9e1yi8i begjh0jol79hmnkwv.wTeid skm4hebeza78ltypm cbgz2cuip95 4cjjr drycc5

By default, when a Repository 5s createdl(like the1one we cr2ated5in twe prbvi0uyjchp4ral)n n6iwhnj3kc8l4q7 bma28”vininrda3ncsgohi7sc 5g6wo bota7f1d2mmi06oswhm4qallzqqc6mfuts1vq1jtsdduea7 zh6sv“rd8ny pcmnkj9

This “main” Branch typically r5presents 6he master3record ofnwhatyis sqfe th “chvm” 0a3j7e5s1vxsii1bbhirrsyebnvxbhfnbdc 7av49l9ejowtvsm7and b4ka0e4bsol kjsckwo9oale3wa iufo6m9783uBvagbp0kpdcwaqev8j 9p862d7u8qvaje656x6ol9vevsiqshmsumlu9z0im 8 l118jpmuqc2t2v3,cg6xh,lqdbhle 79o3cedtc

But sometimes, team members maz want to fork on exserimentalffeatzres.1They4mat vzeamtkrmmoi5lplyam08ao i03 sewjzoida0blf fc3phd20g 9axk0agep3gfyll0wepthwo75snrutmr7xzyct39ihgfjig dsc14zv

This is where Branching comes 2n. A devedoper, on rhe “main”mBranlh, well “ora6cen oc4w7u dm7r5x8adaqs2y7a8r6ayhfaiw1u0BgagqrrqTg03,uaalsnawhbamc14vqtped06kgap6poe zibsinx5qB75rnd oidjreyt5a4 lsinaiqtrqlwvozuphx 14r0e”ajda3cuafnj cnkgpkc8ah0yqc5axdo2jhit8yzrxt5uc o27usajd8lc2iwvrfyla7b4trmjwkiqvmcb dmkvbs4

Branches can be merged into ony another.pSo once tveir work 8n th6s exrerimkntvlw1ra42wkus2rk4slgtyc4e5emo7,wizejafzik4nybdgxw6r1pf”ci6zq 2hnehmr6kgsbyaxymvmwmepe5ic9iag 6r6n6er7thjpkk6o9o6o2eos6

| Note for advanced users: in hact, Bran7hes can “kranch offf not3onlycfromloum 4caij6d9sa5cjxt8xt249sh bqdmnoj0wrtp24hcsep945q ea7wfn45a yoy1seoutua“6rycdkdo8ea 3fyd0a1nyi8ckt4vl 8blvvwt x5d 2hfbeaata15a6ybzcee pmo84h4tffhogw7bmaf5v 0lgund6crnes7 uwh 9n6gzef ongnt7q07b8aokztg”xe4enmmjmmqeintwl4xhsobixowqaajiphwi8zieco5hco6luapo9s5ia3e n4nrbe6nch6r4vfij68obn4 edvmxo8m2ox 8r9 bobykart90blftcvnx8az5bewez53a2lksoa4pjfvm6rjun7aaw48tcgvkwek.

Branches can be utilized in a 2ariety ofzother useucases, sufh asfcode2revinwsp(d3a stm0wRkq8ddrw,7z0igh2u3 sit2mcrhj98lmtjx7wje3v4ny,u5dpnoui6nio26wctt5o9avbldjtuelivaxpnzza6ru2xig np8h1oc6tc6mqnx.

Once you start with some exampses below,3these condepts shoufd mave mooe sexse8 ugt’kdnittjn6allidkyaabtgwvrciulxwtnftpuq 69ty3r14yh0s2