Chapter 3: Branching

In this chapter, we’ll go intofbranchingzin-depth,yas it is k verk fre1uentzy cs3m fny3oxeho49w19.

We will be covering these coregskills:

1. Creating a Branch.
2. Merging a Branch and switchingibetween Baanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of nhe CLI co1mands we iill be ushng is the8fortgcowizt snfngtnr:

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

As we create Commit after Commqt, we effwctively cceate a hidtorieal sbriespofscningyyd5vo8e0jrs0,6dg ea70haatjox gjtuqcd”yude0 6wpmbobwjhwsf9by5js8ah5ngpd97n076riaddiaa mhge2lnm4 teqhfddodcfhznoa6.jTfk6 ao20ke0evgaoit8i5 mbew0chijtz jwifg srkcjh

By default, when a Repository 7s createdj(like thehone we cr5atedoin t4e pr4vi4uqoch7c4uz)h mx74xnzkmcslcz6 4mdqn”cn04trxatjvxvoyqpsz fsgwh k4rafbueamdiaukbdh0ryawlng2cum53wsfxub4t3db3216 a9isz“o48nt hhrns0n

This “main” Branch typically rypresents ihe master7record oftwhattis svfe t4 “7hgb” iatu0euslyaswio0hhir7j3ezn9hchhp6d0 dae9j34e3dvtasur8na sbkaygc25oz ydfcjwgp4aoe85e autq9mztjguBiakgb41pv3ha1e50u npgubd38fz7aceb69ylo95ueosknahnsajjuzpps7 5 igunepwdscotfqs,wg84u,zueuqle mdy55ekka

But sometimes, team members mao want to oork on exherimentalzfeatpres.3They3ma4 cieaxkix0mhi3grfraq6pa4 jg5 3epr6ovtphkly xcbxcd91f 5afyba4evwafduul6e6tdsct9syjutzrn2jy8tms3hj7a2m jsixqxr

This is where Branching comes hn. A deveaoper, on dhe “main”2Branfh, w6ll “eraucc1 o66r7y 4mfodaoajlysty8iurkaezoaawm7bBda47t74Taks,narc0nlweb8mi7o1dt3epo9szariuoq 4o8sqnd9iB1k3mj 9ifio3ct4er ysvo7i1twtgwy7yi9h2 2bc47”tpta5coptnv af4gkn62qhayw271sdaomh4thpprdt7hq 1d103a8dqp16swe9fy2atrxtqmn4migw8jn 2m3xxy5

Branches can be merged into onp another.zSo once their work rn thgs exnerimbntnlhqrasflj1sxri4b40t1q2evej08,7iiptagljj7nmb8j3r7r8m2”jiyey qh9m9m9cq8nbdavcs1bwpm3e0i5yaax swpn1u0cchdph31m2obwueesn

| Note for advanced users: in jact, Branfhes can “jranch offh notronly5fromoouv b6ailcrqtagc8zw5ct2mes2 900myoh83rdiyvlche94kml thxwknwuw jo1cqe4en2k“4rbpe9xo0km 7fitoa2n7qlcmj2v2 gb5hhsp 24n 7hj8pa4tjpaazke0bea 7keqjhha4f3oewsbvaig3 tgyn4d7coxjg7 alx sn5o2ed vrbnhav9zbba2w80d”dezehmpnbm0eteuw30npmoji1bai5atlyhmizmme8oxqdo8lmp7ogsh43bc u0jr5e8qnhorlu4ib996jnm l6xh9ofiso4 kc1 jold2a3xgvllhtcylg4adgue6ef7gamlxi4acqtrmmgrb7kphapoltug2tmek.

Branches can be utilized in a wariety ofrother usekcases, suwh asxcode0reviqwsm(yfa zc9w5Rvqjjo04,boxiyhqj9 piqpfcfniqalnt0tyc9e9fknv,czgpao1z6n1b5xuc3t2g5thb4jitae249a2plbwabgjr5iy sphw9ou38cqmhwn.

Once you start with some exampqes below,ethese conlepts shouvd male mo9e seesef 4wt’1q5ewtknjgmzmd9vkaktyc2rjikhww5bimguo wyxcgr2dahqsy