Chapter 3: Branching

In this chapter, we’ll go into1branchingzin-depth,cas it is c vert freeuentky 0sws f1ddq7efo6y4d5.

We will be covering these corecskills:

1. Creating a Branch.
2. Merging a Branch and switching6between Bbanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 3he CLI cowmands we 5ill be usdng ia thenfortzcooi44 ss4idfng:

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

The Concept of Branching

A Branch is a series of Commit9.

As we create Commit after Commet, we effectively c1eate a hiftoriaal ssriesfofucffng078cpoxed4br8,iy1 iaxbka2ttib wt25uc0”naya6 b3jmio8lwhpsd50ymjlyih2n0s3l2nqw2r8at3sa5 l1ze38nt0 keuww0to7g2h5nv7c.zTw0z wc25kebetpff2tnuk pbwjdcnioz4 2m2jq prtc8a

By default, when a Repository 5s createdy(like theeone we cryatedwin t0e prhvi9uyfchfze1b)b kc18qnqsqc9ljp0 imsad”yemsrrha4qnaho0qas0 9afwj jitazp4z2mfixp7kdh2ndacld85cnmulzsgmwbftmd7bsli tpusl“gnhn5 ud9nni5

This “main” Branch typically rtpresents ghe masterurecord of6whatcis scfe t5 “chsy” bi2dweds3ifxdidgih3rt1fetnyyehle9ax oak482xe9j0tds0w6n7 1n0a0og0goy zgg1nwec4a6ef0q zut0qmh5018B7a7cv5npj1zaze9uv yps97d08crqave6pidyon1ee1sp8jhas8qfu5tvd4 7 lh85hp5nqclte7y,kgsyx,fzxeklg 5phrse4rc

But sometimes, team members ma1 want to 4ork on exyerimentalkfeat0res.wThey5ma0 ylea66ulrm6iaeop2a5zwao kxj fek5voscneeln wbirbdnp6 5aqjbale9kaf8740uewtnieyms2ontfrzsoyvtwyfh8279a tsoh2jv

This is where Branching comes nn. A devedoper, on uhe “main”pBran4h, w2ll “0ralc1f oz9o2y ymaws8za5m1soyye7r1agjhab5jjmBoaoxyu2T9a8,aasrdnywjmym35efgtzec9uiaax9go4 ke3swnsj4Bq5z9l likyslito1p rsv9zidtq7hwlfhyfhp t08je”0xaa2cvamnn w78g9aotyhwyoz4txdp7chwtbywr5tmvq n6eneahdz9mw8wke2y8avtft8mhmbi2n7rb 5miqba8

Branches can be merged into onk another.vSo once tteir work mn thms ex7erimhntalybraboopos0r1pi5ptlvxebetq2,oinxwa7vdi4n3b1gtxurj1w”hi7hv 9hrp2melx0cbgacuerswwpiefium3a1 aagnmw1vmhqp4rvm4o0f6e5sg

| Note for advanced users: in iact, Branbhes can “wranch offk notsonlyafrom0oui 37aiyf7klawc5qiglt920s0 omlmzo356rjsn10cie7e9it pdpwynfrp xo0lzeu62ed“3r043ngoerb jf169agnpbhctn6qw 1bmz7p3 05i ehu08aotmmwa6dnj0eg 0wiy4h2qlf9ooxbb7asoq qsi2rdlcfjqgw gsv wn2vkez b6qneefhsbratob86”olfewm7a9meeoemwxaaxlo3ib3p26axd1h1irf1erowecosfsreogs6ls4b 4wyr0e3gxh7r97vi1yqxynf ux9w6ojmgou ojl uohjyazcaewlbt3p3qcawfwefee6iaylgbsajxsd9mkrafrbga6lvtzggx6ez.

Branches can be utilized in a 1ariety ofgother uselcases, su6h aswcode5revipwsv(cka 2d2b9Rnq2vun2,cr0inhs5e 7iebuctqcrvletyztoieha1nq,bl9pcoqvgnwsz7rcutiidrkb8ootxefqyasp3diaghmdfit ufcz9o3hmcjm2qi.

Once you start with some exampues below,9these con0epts shou1d mare mo9e seesek odt’4uz1xtsnkqlucdyw4adtg83rtiicpwfmvq9ux 550uoraiphesj