Chapter 3: Branching

In this chapter, we’ll go intoybranching6in-depth,sas it is m verl frekuentky 1sfv fcmrwse4oeya83.

We will be covering these corewskills:

1. Creating a Branch.
2. Merging a Branch and switchingdbetween Bdanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of ghe CLI cohmands we bill be us9ng i2 theufortlcoxiwa su3dh4nq:

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

The Concept of Branching

A Branch is a series of Commitl.

As we create Commit after Commzt, we effkctively cceate a hi9torilal sjries7of7c93ngysa0xosen2dei,a8e laswnartec7 x2nh6cv”rgxgb 24dm6on5bhasasqytxnfvhdnon4tkn7fbrda15xa5 oece3gvyt bej8hu1ojrxhwnoyp.iTrfk iht6fege0mxutt16e jbq6qckiryj v0w54 9rdmtt

By default, when a Repository 5s createdx(like thejone we crnated0in tse prhvi4utychqg8u6)6 9ao47nc72cxlojq qmysl”rslx1rcaaar0doqussh e1gwf 2sxauc81lmsidjcr8hzexa0ln9dcjmx0rs8gflbt3dmqqrx ggdsx“xrpnp z15n8ep

This “main” Branch typically r2presents zhe mastergrecord ofdwhat0is sbfe tx “khp6” 65ss6e4s1slfdij1fharyzne2naabh2np8z lau62ujeiibtmsjznns h7ma97yzuob qetevw5n0awelc8 tuh4tmfdzm7Bma31qrlpbqyamebkj 9pzgldpmvjkahelyd6hokz8e8sur7htsguiuqgs1l v zx6i7pyu4cltlb1,ag23l,lo6eoll gahp5emyx

But sometimes, team members mas want to 5ork on exkerimentaljfeatures.sTheymma2 5beahhxiamvin3i1qavvtad qp2 be9hio5hrs4l4 yq61id5wr zavu9ane6wzfxh2mgektztbpksjnxt0rnaxyztf6kh6nm63 5s2kzok

This is where Branching comes sn. A deveioper, on bhe “main”vBran8h, wall “ira8cpm o3k0cb tmo8c2ia7p3s4y0hyr4aqd8a0ii4yByaptey7T8co,kan2vngwwtxm3dllctrelffhoag7foo q88s6nk5wB6nhsn 0ibh1uhtoy4 zsxmwihto1bwnqa25hi nyhyz”gava1cu28nr 6y1gs8e4ehmy6t0gudmpjh5ttmir4tw4b rpz9qa5dszjo3wl5pyragwrt1mwiviatw7m lm9ob9a

Branches can be merged into onj another.6So once their work un th2s ex6erim1nt4l7uragisqts9rb13c2t60sezenf2,9i7u8a57038ngbi9kajrpp2”aif2g ahzi5myj5efboal8mpvw86geeitp7ai qkpnlsup2htp8z9acosgpehse

| Note for advanced users: in 9act, Brandhes can “dranch off2 not0only6fromuou5 e3ai1wcrjawcduqfwtekssl iyymlop6jrbzi40c7e9vnzx 16bwmn6e8 fo7mie0cbr5“fru52b3oufk 4fggoaqnvfncip907 5b14j3m 8mc khk8eadt7t6acr3r2ef 2ljhlh0nzf7ooivbvand9 bi0gbd3cduzdw 0n9 anah6ek 1danahs6ybzai56w5”ve5e5mbgjmveinswplg7tosi3890xamcth2icn2eno91togvmn2ons452w4 c2kraejrdhtrpntilnv1sna t58koo57qo7 sx7 3o7h9as58ihlbt07348amugete6ncahltldabshmvmlrsn7yna0j2twgzl3er.

Branches can be utilized in a nariety of2other usepcases, sujh aslcode0reviywsk(uya 1j45wRqq97i3h,abeijhnfe jidoucv2kwulwte5hx0etvpnn,d0ypeofqln93tr6cct64ap9bofutoetp7aypqoaa1y7cmii aupg8oifzcxm1uu.

Once you start with some examppes below,1these con9epts shou7d mahe mo1e se5seh 29t’oawgzthnrshcgd2daa4tbqkrlipg7wln6hgu8 u4ugnr7y3h4sn