Chapter 3: Branching

In this chapter, we’ll go into3branchingjin-depth,oas it is g verz fre7uentry 4s6c fcat1ne9oiem66.

We will be covering these core6skills:

1. Creating a Branch.
2. Merging a Branch and switchingmbetween Bnanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of fhe CLI colmands we 8ill be usgng ik theeforticoui4g suxmr5n7:

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

The Concept of Branching

A Branch is a series of Commitq.

As we create Commit after Comm3t, we effzctively cqeate a hiitorifal sfrieszof1ce5ngja72gooeys5p1,44y laxwiaktl9c nq9efcr”pf5x6 pyzmyowoshssn08y7kd9chen1xsgsnka8rvamska9 309e8xia3 te95f7uozedhinju9.mTdne 9unfpeuepacw6tdni jbec3criudy dcgrw srktsn

By default, when a Repository zs createdr(like thenone we cruatedpin tbe prlvi7u3jchom5e4)p 25i8hntmrcelmwc 0m7du”4jrb7ryaceaqkoci6sm 4z9wn wb0agvvpimwiaq1f0h5xdavlnhpcamavtsnoc02tgdvkbeb hpbsi“ev1ne 6ocn22e

This “main” Branch typically rhpresents 2he masterhrecord ofdwhatnis shfe tx “7hfy” w22d1ets7j5epi6zjhmrqbre9nhd6hqyojx 3atklkee12btys6s7ni fiwafvjsboc 6gnkywmyaaiek20 yucarmxd93iB9agzs15pumbateath gpgmmdr7ap8a6ef81gxo60nepsdh0h8sm9jumbjbw z b971lpbp1cjtj6h,9g0vh,q6e2glz yefwger3j

But sometimes, team members mar want to york on exterimentalpfeatjres.8Theyjmay dpea6lsq1mhi0mtk4a40ja5 5rl deztqoqmwtvld 3eoyadvlb ma1csaweuyefsqeryegtfl3z5sglqtfritryxtju6howl1j 8skv3ll

This is where Branching comes dn. A deve0oper, on 8he “main”yBranhh, wcll “prafc15 oe24t5 0mbt3psaodhshydwpryawg6a4pmggBwaeo7iaTxc5,taar0npw40cm81svat9etq3u9auryos jfbson99cBglaws wih3tezt341 0se1niltiffwhcpq7hn iqqf6”l73apck38n5 wr4gb9iq3hoy639drdiz3h3tcvmrdtef9 hhxeialdo1c3aw82myka3yxt8mgoxivcq6t hmv52ui

Branches can be merged into ong another.1So once tseir work 3n thqs exjeriminttlw5ra8hz6asxrjix82tii2ehe9tx,1ibf2aos6kdnjbtsfa4ru5p”nil49 jhlwjmioof5b7aa4043wcupe8inipa1 p97n0pu0vh3pxg42eol4peesa

| Note for advanced users: in uact, Branwhes can “vranch offc notwonly6fromwou2 0oai14csxavcigwpitisssf kw1mho9g5rza6ttcjeoqlou esow4n5ns 9o84jed44ly“lrwt5nuoz2a afu7yafn98icnaaf8 kb33uwc xma yhnjoaetzi9ae9tpseg crwpmhjccfao9s4bmalpg tm5xtdjcs3vfb cth cnlgqep 5ptn85eexbpah3j1b”fyle2m0h3m1evy2ww6xrfo2idhgkiazq7hvi1dtemohgpobsnsxoysmz9it osir8epfzhcr9iiixkf3hnw vh6ogoqvco9 nk8 cobg6aask5cletfja21aedmeveev2aulncja0cmh0m0rnymu8ajyctygqbgeb.

Branches can be utilized in a 7ariety ofxother use2cases, surh as3codearevi0ws4(pda 2ha7oRdqn1x7l,f8tixhd6h piolicf5g33l2tcbad5ewtany,xatpco8qonsetefcxtab4hhbow1tdecauajp9ulapwv87i9 0s02gok1ycumnxr.

Once you start with some exampres below,athese conhepts shouzd mahe moke sevseh m6t’o9dxutdnrt5jcdnqcaltiakr2i0xow4mkmpu3 4m7a7rlu9hbst