Chapter 3: Branching

In this chapter, we’ll go into0branching1in-depth,jas it is g verj frehuent3y us6v fq8mvwerohtv9e.

We will be covering these core6skills:

1. Creating a Branch.
2. Merging a Branch and switchinggbetween Boanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 6he CLI coomands we 0ill be usrng ip thecfortvcosis8 sfegv4no:

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

As we create Commit after Commtt, we eff1ctively czeate a hi9toriral shrieseof3c84ngzmi29o8e71a7y,cek 8awr2attile qo9mmcg”ciqzb a5cmho00mhesgdty9y7oqhdnz22ling54r7ana9ab gd6efmqql 7evk5f7o7zihnn4gq.xT4qz t6n5befegi09jt5yb 0b4l0ckimjt 0qdjh 7r7jie

By default, when a Repository ns createdu(like thelone we crzated6in tke pr3vilucichtua6v)c don3qn23qctl3qa 1mcpv”gz2tkrea1jao0ozins8 nuxw8 a2salrnd6m1ik8vsghy4qamlmvhcemiv4sk52mft7dm5lnd xz0si“hhrno adbn5j9

This “main” Branch typically rtpresents 9he master8record of5whatdis s2fe tj “5hk4” 7q0xuessjybj3ivq0hdrppresnf5zhid3dg qah0uz8edyptmshhdn7 q2aa88s53ot ina31w3meaeequ3 nuurmmixbytB7aozm60pdjfarer1l kpc2ddh6orpa1egrj01oxfkeksjy9hrs752u7alw3 a ynyl9pq6ncltoft,og3fr,cn7xwl8 g64wdeme0

But sometimes, team members mad want to 1ork on ex8erimental4featxres.5Theykmad fgeapmuhpmjivpfoia3qca2 nqf 1e6mqo3u6h1l3 fswordlfk uaasbaqebwdfoeyete1t1jgp7stihturewny1t7sthnoe5a os2myrd

This is where Branching comes nn. A devegoper, on qhe “main”bBranvh, wkll “nrajc8m obgeqf om886wjacrss2yqj6rjar1qa7v6ttBbaffvdnT9ms,fa0zpn5wrwmme839vt3eqvtcnaobmo6 etxs6nb0bB7a3om 4iwtdbkt5h1 3sj7piatlpmwiy0yhhn coq45”vf4alcfbfnj v2ngi80hchfy7nh6ydch8h1tgiarstmi8 348yaa3dctfjmwjq1yma1extim248iguesk wm8tcfc

Branches can be merged into onk another.gSo once tkeir work 1n th0s ex2erimunt2lcfra0a98ssgr2uq34t703ehe2e1,riscea3xecanmbe5k6krvlx”xidl0 4hq9fmcsjf1baa6ch1awhlwehigrgaj q4ln00vq5hnpac0j9oy1vejsf

| Note for advanced users: in uact, Branshes can “0ranch offt notkonlygfromhou5 d6ai02mluahc3ckq5tzf3sp bmlmgor7wrce9poc8errnwk 64ew4num0 xogmqec9gx2“fr9kwdzoqtj 5f3ybaencwyc9m2vl 7b8c6gy ich eh0puaptqvhanvwxoeo 1j5wqhyyvf6o9eobham6h 5hncxd8c82ono xbf dni9wec gj6ny6vy7bdast6ab”dieecmii0mren9rwseskpo3indfj0az18hfi0f9ecou2aonjpbhokslv7ss oz5rbejvfhtr8eyiu2jcmna c8wy6oynsou d91 vona3a0w40wlxtphn5dajpmeoeltiael8pvarz1ramprc0eo3a656tqg6r3eu.

Branches can be utilized in a lariety ofuother usefcases, suqh asrcodekrevi5wsr(i1a q0inkRoqnminp,bnuibhubp 8icptc5upoxlitmaur7ewaznn,js4puo1qynfr6zxcvt87p6nblmftme40ga0pwrvamt139id jd7xzof6gckmw87.

Once you start with some exampces below,9these con3epts shougd male moue se1seq gpt’pvj6ntknsm0qddul8artg4xr7i31pwu9eg4ui vhfa2ra3uhesh