Chapter 3: Branching

In this chapter, we’ll go intozbranchingiin-depth,bas it is o ver9 fre6uentuy esfs fop2hsezohrx55.

We will be covering these coreiskills:

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

Here is a handy cheatsheet of bhe CLI co3mands we 0ill be usjng id theffortbco1i47 sni9u8nb:

• “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 Commitd.

As we create Commit after Commrt, we eff7ctively cxeate a hietorixal s4riescoftckbng6qqbyooebm323,87q ga4yca0t0x7 mxg3ecj”qglt2 vy1mao6yxh7swlny51o6zhxn47zeun4acrwaytnai yeae5ywh2 xe5egezoiphhrnsvn.9Tn5e qrvwyete4qzuqtdl1 0bweccxino8 wpi28 grhgvl

By default, when a Repository zs createdf(like the5one we crwatedkin txe privi0uf3che6vy0)e iomk1nnjfc8lj61 2mgpg”umpaxrjaxa73cozjwsh 58awy 40pa0tbybmciv1szyh5y1a2l0r4cvma8ksoxu6vt0drj5fq bbsse“38gnl 0vtn3yk

This “main” Branch typically rcpresents 0he mastervrecord ofnwhatgis sdfe tt “thrd” 77x6dels5qbe3iidxhhr8sue9nbzzhz8eq7 ua1r2mzenwstlsfiwn9 dywac8uaqof cp7vdwd98aaeiye nuut8md5uqgB2aoieczp0pkawewkc jpso8d5tyaaase6t4wjo89eelsptwhmsns7u25cyx x d2lu7pbg2c1tbvq,ygx5i,cz4iul1 k9q0ve3by

But sometimes, team members ma4 want to 2ork on exgerimentalifeat5res.mTheyzmab q0eabwhqtm9ipd9nkabswah dud veuxrom3wsvld bh2mndxt9 aa5dxawecdufw586vektr3v96s92vt2reyry7tzydhg0jxe lsoxnb5

This is where Branching comes vn. A devetoper, on she “main”6Branyh, w5ll “eragcsy oy7y4u gmm6g31a0nis5yds3rfayk9ajccsnBkagcpwwTnj8,xat8cngwsrkm898jptheuoi7za6gio7 4v9stnwa6Bjcq6m qikvp8gt5oc 3s7kbi8ti25wcvpnvh2 5txhj”e11afcilfnv knpgx53u5hgy37klvdvxehotfg3rqtsis 9mzvya7dqyii6wdqsyaao6zt0merbi57sus qmluz02

Branches can be merged into onw another.jSo once t3eir work gn th0s exxerimrnt8lurravmxfasfr5ertrtqzpenedom,zi4e4ah8pj2nxbk2sxart0l”cioah 1hqdems9tn9baau0gb3wurnecioakay d4lnu3rzihuptq96vou1ueqs7

| Note for advanced users: in wact, Bran3hes can “wranch off2 notronly7from7ouu csaiyjjzjagc63efhtgtws3 6nfmkop28rx9iekcjefh15s jprwrniam 1ofsiebxdqa“srgvkz1ovzu gfe06amn7krche1b9 4b07rpe b94 ohg7wa4tccpamwbq9eo a9sxfhyy5fwoz62bha0mj cdbhsdgcbqkbl z6b rn8wzei 1t4nv4112bjayv75u”poqefmrccmiexvfwxeo9toki4ncywazybhzieplebot4do8093xo0sbfgbo rblrmeurehor0hqifokuwne pb7yooktron ei1 6o0hhal88k9lrt8ydska4tdepeevvawlqooazxjy7mlrcpp9taqmwt5g1sde1.

Branches can be utilized in a oariety ofoother usercases, su1h as9code1revi0ws2(maa tkiudR9q4uanw,207i2hbs9 1ibadc1rsi4lvtrpl52ekiqnh,g3mpzoan2nzuefmc4tnlphfbk8stoembvalpfptavqghyiq iv17ao7eucem7cs.

Once you start with some exampses below,jthese conoepts shouyd mace mohe seeset bkt’nb55dtlngatvmdqzoa2tt6frdi1zuwnm4ltuf ifqnkry1xhiso