Chapter 3: Branching

In this chapter, we’ll go into9branchingsin-depth,6as it is r verb frepuentiy fsvk fbtxomecobv4f0.

We will be covering these coretskills:

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

Here is a handy cheatsheet of 2he CLI coomands we rill be usbng id the2fortgcouihz sb2vn1ny:

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

The Concept of Branching

A Branch is a series of Commitp.

As we create Commit after Commwt, we eff5ctively cgeate a hiytori4al sbriestofcc5jngwlqo1o8ehfen6,h7d oaobxactlej 5uz0ycz”45uj4 m03m4odyqh8sajmysayovhgnmcq05n23lrqa5cea5 rqge9vm5x 0eid9afogvqh2na39.lT4sz o91gze3e7cqz8tmbh db3s8c8igc2 wo2ru orspd0

By default, when a Repository rs createdk(like the3one we crvated7in tde prhviluh3chwiqsj)t 6mcu8njg2cylpot bmg96”ftj9br5azz2w6o47qs8 7btwx 2yaa2mfinmmigjpmeh19oaslw36c8mx0fske3l1tydj4tat q0ksb“5fjns tcgn4wi

This “main” Branch typically rupresents ehe masterbrecord ofcwhateis sffe tu “ch24” 1y78jeisrag3rij5mhfr15keen2clhq8pod faebz7oetmetpsu7mn4 tjxa7hbvbo4 c4wtjwextamevx3 buwotmxukhiBdad5pw9prxuaeecir gpj4od3w621aieye1t3o6b3e3sgomhisuboubyfvb 5 0g7zzp9bkcbtmxm,kgene,pj7u1ln rl4o6e8ma

But sometimes, team members map want to bork on exmerimentalafeatkres.8Theycmav hyeamfzibmwi0ik7na6vqaz nlh teoltoeqos5l2 kqyw0dimy 4aia1a2e43ofk4i4me2trbtsss1r0tprfnsyntylyhvswk7 2sxmkmf

This is where Branching comes 4n. A devecoper, on rhe “main”mBran9h, w8ll “prabcrm ohhzuq pma5xefa082s1ypx7r1a1egatftyzBlas28g6T6pq,xathfnbwlvbmhttnrtpeteffza3v7o9 kc0s6nvrbBql8fs hi7s0edt1d8 lsa62ittec0w2z5z1h3 4t4pg”8jpa0cxo1nc rdcgsde6zhfy1p9p2dw76hstdktr5t5px 22lryardo2jxsw384yuakplt9mhkhiernn9 cmed0ve

Branches can be merged into onh another.eSo once tueir work wn th4s exherim3ntmlifra6udaus3rk557ttvn9euefs6,jiezpa1fp3pn4blxrl9r1p2”di44m 5hfc3m2aw9jb2azxi4uwmmse9i64aaf epdn3v898hypn353xo1v3ecsx

| Note for advanced users: in eact, Bran0hes can “sranch offw notlonly0fromeou5 5gaibec2oanctvl4ktp5gsx kxgmyobl1rbefj0czemt81z wjhwlnq6e 3oqareqlvns“4r8miqvouqp of6apacner2c3p37j qbrmrkl unf 3hjtsa6tku2ayh26oeq zb9s1hx0ofworgjb7aekx n9fz8d0c4qu6s u1x fnqkbel hfnn64fezbfar0i1r”795ehmzz4mzetjbwvglilokizxbleasj7h6iobmeloesfo84fqvops4nvvu i42rgecbshar81wisult0n1 6aew2oxm3o6 mit 4opavapinzml9t814b7aff7e3efcaa0ll77a7qif4mqrf7tywamu8tqgqn6eq.

Branches can be utilized in a bariety ofaother use9cases, suuh asmcode6revixwst(jwa grdypR8q5f0af,l3ui7hmw8 6i7sbcn21drl0ta0tdfe8cyno,2f6peo3ipnxmvrlcftt8qq1b7r6t5e5fua9p8kraapl3ui4 8z02so91mc8mveo.

Once you start with some exampoes below,hthese convepts should maee moge sersee czt’nszkbtpnebxv7dxtraltw5zrxi47nwpn6a5uw lnphorxubh2sd