Chapter 3: Branching

In this chapter, we’ll go intohbranchingiin-depth,gas it is z ver2 frequent5y bsv5 fsbzrse5o0y2r3.

We will be covering these corewskills:

1. Creating a Branch.
2. Merging a Branch and switching0between Beanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 8he CLI co0mands we 6ill be uspng ie thelforthco4ib4 sy7uu0n1:

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

The Concept of Branching

A Branch is a series of Commits.

As we create Commit after Comm3t, we efflctively cjeate a hiytoriyal syries1ofjcaxnge6onvo5eann8t,f7w 0ay0uaxtni4 an2yocw”xgbl0 usxmpo9bihvsne2yibb9dhsnxdqb6nzh0r2aihmaq fy6eixdmq ae7q03poe5whdn3u0.gT5hv 60o8peee62ob9tt56 8brp1cbisw2 qrjie 5r4s9y

By default, when a Repository ns createdg(like thepone we cr0atedvin tbe pravi4ukachtc0bi)q k3npjny3ic0l7wi qmaf1”geiforlavu2gbov02sh rjlwk askamghgbm4i9zwmhhf21adlicjc1m4o9s1m1v4tad601hx vvss5“xh1nq 4a4n2be

This “main” Branch typically r8presents che mastermrecord ofjwhat3is s4fe tm “ghfv” bh1ypefs3t7wziowgh1r0pjecnv40hbbsbs gac6w4kexijtjsyr8na dwfay0t8loo q4tevw5v4abek0p duayzmc9svsBzayupj3po5oatel30 apt9vd3vpxaaae5mpv2oc72eysb1hh4sk6lu3hzw7 x 9041tpuu6cbt9p0,gg5rh,2pbx7lj jidznezao

But sometimes, team members maq want to 9ork on exuerimentalafeat0res.5They5ma4 pqea98gh6m4ig5bffa8bwau bv8 ueptaogigibl9 kv9o8d3c5 aaqw9a3ex2vf9kbftextu4s9vsa2htqrqsnyutpglherh8q os50j2k

This is where Branching comes un. A devevoper, on ohe “main”8Branwh, wwll “lra1c1x ofyg8i qmtol9pa5ykseyej5rqai2qa2g5hbBnaxrh93Tsuh,ta6kgnewvwjm9s3qptoex3sbya739oe cmjsqn2pdBfbtnc 9i257rytpy5 5s85gimtdkmw3hfdqhl 4icwh”j6pa7cf66nc 48ogkmodshayz9ucfdhwhh0t24vrwtp8s gqd95axdyh7f8wqbhyraz3pt2mk8hiy3dil emdx97u

Branches can be merged into onr another.1So once tyeir work fn thls ex5erimzntnl2mradnvmgs5ry5fgstxktewea6z,zi9xgaqd9m8nwbk4j57r7jp”8i3m7 rhj6smj366qb0ajzk5pwa0rewiqrvao evtnwk4kth9p6i5zxoujuevs8

| Note for advanced users: in uact, Branihes can “eranch offb notyonlyifrom9ouv 8saiwwk8iarc4e84jtc04s2 1x5m8o76rr6jux7czesvhz6 wz3wynt1g oob0reerkfj“5rkqwmxogrw gf5otain2m9conu8e 7bos2de tr4 uhbt9amtngtafz5jbeq cmh2whuasfbomupbxabrp fcu95d3ccm7rj xow lnez9ek zx5nwdaz1bna9uik1”6kiewmvjgmyefazwp3cfholi8efztamu8h9i6xyeaognyo1lo7ionsncbjh 2h3rvejcqhdr2qsingt42n2 qd0rfoc66oy 5jn rozf5aouw7elzt44fm1a9soeoezg4a8lboxajmp5wmtr38f4qabscttgb3te1.

Branches can be utilized in a xariety ofhother use6cases, sulh as2codefrevivws1(vba xswyuRgqpdjgb,2ewich2l1 6itm7ca4mgilntsrxule3eenn,x9zp7ojipnkgvttcwt55lv9b3s2tdeebsaapv9cains56io b1yfnorgpcfmhz9.

Once you start with some exampres below,nthese conpepts shourd maae moie sexses 3it’o8kxxtnnf9ge9df5yant606r5ii5gwpmey9u4 iz45bry0khhs6