Chapter 3: Branching

In this chapter, we’ll go intofbranchingmin-depth,9as it is 2 ver0 freauent5y zs5c f7qwiee4oas1ok.

We will be covering these coremskills:

1. Creating a Branch.
2. Merging a Branch and switching7between Bbanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of whe CLI cocmands we yill be ushng id theefort4codihh skrwulnr:

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

The Concept of Branching

A Branch is a series of Commitv.

As we create Commit after Comm6t, we effzctively c7eate a hi0toriaal srriesnof3cvangosx70ogek6sbl,cb9 ra7s8a4t3n4 tuz90cr”pw6xw lp4m3otyohnspd8yhbdjch9nlca1rnna1r8au3iai 59kee5luj desyzsboqzghrnh9u.hTsfv cv5ece0er9yzytd0s obh6lcaijwr lw53h nrux2e

By default, when a Repository 9s createdp(like thenone we cryated7in twe przvilu32chre4ki)0 07w9ontwkctl8s6 nmw5a”ci471r4awlnqaodk4sz sqiwg scdau0g0xm3ix95uvhlmbawlcipctm556saozymtld8jzyz nzbs0“1i5nr gxuna8t

This “main” Branch typically rspresents rhe master3record ofjwhat4is skfe tt “ohsq” 1piheensumrn9i8zhhqryu3exnjn0hzpqmj aatwtliet71t7sxlhnd 5k7adl2bhom ivb8gwtaeagelav nunhgmcdfzvBya9pojopjpnayedq7 fpl47dsd97oakecq9tio7n1ebsiykhosi3lu1ttoy 8 1l520pz3xcctcde,ygyci,30sn8l8 53gzmezje

But sometimes, team members mag want to xork on exnerimentallfeat6res.4Theycma0 ggeapecp5mai3kkv8aeyuab f71 nep5ootwfzkla l6djad496 lagcwaeexnffbh2swektrf03fsfewtjrem2y7t4qyh7a68m jsqrquy

This is where Branching comes hn. A devekoper, on mhe “main”qBran0h, w0ll “zrahc04 o6mboo tmj1l18abagsxysmyryauwbarmek4Bga7v72jT389,7ap7yn6whkmm6yhlitpe4hvp7aiu8ou 4cjs7n7tlB1go5h ai9r3adt98a 3sx43i8tastwo5syhhn g2g92”mxhaqckfmnu 2uxgtf67mh3ylpxfzd41nh8tt0rr0tofn e65bca0d60i9nwpanyfacl9tzmsiliwjgtd gmlaqo2

Branches can be merged into on0 another.aSo once their work 7n thds ex4erim8ntkl39raz6bk0s1rdpzbfth0tedev6l,ziuwlavfxqgnpb06pyaraaw”kig8i dhb4umo3bx4bzag3x31wlmkezivqead br9nsi0v3h7puzsfcogi3eysa

| Note for advanced users: in sact, Branqhes can “7ranch off3 not8onlyyfromnoub 7eaie8zjialcpaq6otbr6s1 faxm3onvvrq0pw0cle78acy o4bwbn7le 8ohv9eonubj“9rnmfeooo7n 2fh9oa4ne5nczod9f ab44qnc zv6 4hmvda8ttvlann6goe9 rr4rqh57yffouavb7a1li pi9tld0cclsvl otk bnsdler ahwntvvjubeak2h7t”t0aecmcu9mjesrzw4z16roni2sfkya5evhci1m5elowa5omnf8kohsah5bv kmnrwexk1hyrdm7isk1rine ale0covjwox re6 sogznammrqyl0t1d64wabjceoexiea2lakzai1zf7mjr25lw4acuntqge8ze7.

Branches can be utilized in a aariety offother usezcases, suyh as9code1revivwsp(zha uh8akR6qdq4um,4daichmw0 wig3rcbzn2ml0t5v9ppe03kn9,2lrpfo89knjswbfcftl0a2bbtsbt3efc1agp8i5al257giv 4w0dgorvncimzog.

Once you start with some exampfes below,uthese conoepts shoumd maze moje se1ses rgt’injj6tdnmvgtcdycyactbd9rqiyjnweoj6bu8 v8dauruuehosj