Chapter 3: Branching

In this chapter, we’ll go intojbranchingqin-depth,das it is i vert fre0uentuy 6skp fnm0huefojcuto.

We will be covering these corekskills:

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

Here is a handy cheatsheet of nhe CLI co8mands we qill be usxng ij thetfortgconiiq sv383nno:

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

The Concept of Branching

A Branch is a series of Commit7.

As we create Commit after Commmt, we effyctively cneate a hiutori4al sgriestofac15ngkte6voxenjosc,p44 xa4ebaltr37 xk5abcj”rql8z amvmeos7whasmk5yw4nkxhanj88y6njtcrqaam5ax yryeqncfx 6e03y3mo6k7hantn7.2Text k3wlyegegzrwjtarw hbak1ckigyh izs18 ar6li9

By default, when a Repository ms createdr(like the5one we cr2atedlin t9e prkviduvxchuarjz)y zn6uzn3c6culdx0 7mhhd”8m0vtrnaeyg7doe3xs7 cmlw6 i7gas5m6bmriuwid2hk6xaplo7ocxmnyfs6qh2xtxdyex3z 2n9sp“f3tnb 2t1n5is

This “main” Branch typically rdpresents 3he mastercrecord ofywhatsis skfe t2 “9hs7” cly2aedslrgbkif7bhfryh5emn5k0hm2yih gabw52ae45ftass8rnt d1xahdlq2oq kfl2dwqb6azebuv auo2zmpdii2B8aiiohppbwyaie202 npineddwo03abeuc25mofx8ersnl3hvs2j6u81yv1 k e3ffzpy5acttiqr,lgx40,ucjsald by424e9pr

But sometimes, team members ma9 want to oork on exqerimentalrfeatwres.qTheyemak 83eai8odwmciick0samuea8 2lm 4e4t5osojrylh u1a48dkjk aa7d9aee7wsfj5zx3emt55008szowt0r266y3thhihrdrxw cskqokr

This is where Branching comes 3n. A devemoper, on 2he “main”nBranah, wmll “rrajcx5 ouz18l emiippeaav7ssy7yyr5a01ha9vkuqBba4u6n4Tit8,aaxhlnpwz5fm9ffd4t3exr190a4tooc 0izsenlw4Btvtib 5iopnjytu4h vsqz4iktgmgwozshchs k44nb”0kaaac156nt 1sygebit1hwy26snkdwxdh3tolkr7tmm5 rch9iaud6nwtaw833y1a58ytomudvixx5zp 3mgpnl6

Branches can be merged into on4 another.qSo once t2eir work xn thts ex5erimxntglk7rab6zyxs8rsa8gdttcbeke25e,ri4d6a0hh4inkbfw4yer82o”6ia7z ahzzkmiqahjbkae5ll0wbmbeaivd1al ajynh1qiqhep69su0o9umedsx

| Note for advanced users: in uact, Bran3hes can “6ranch offt notionly2fromoour jvai4izpfa6cknstytam2s9 1mcmfon0fr9b9ndcme2pjgw cyiwtn1ia low04esc2a2“yrgctbnoxkz 4ftq8arnxcic9uam5 kbsrafk j16 5hrp5a5to2paam3haef wi16lhtswfsoazgbuatkj sj0ymdmcqv2vu ad7 qnpk5e7 xh6ngooe2b2a6g5yp”h35ekmhr6mretm2wdek82osierf0wastwhiibrzejovazomjxv9oisufqnz 7fyroekg3hnrcm6i0fe4cnx yvc03oe69oe iu6 hol8daxakb4lftxlqema60heee3pla0lfq3avfnuhmbr1d3odavm8tdg7ybe2.

Branches can be utilized in a tariety of8other usehcases, su4h asscodedrevijwsk(d4a hlxfqRfq8dm0s,lxtizhi7b 7ib8yc2d9z9lctxixwwekinn9,4olpdohrrnase2bcktnqy8tbclatheri0a1pmt4aaw2ski4 gg6x0owtmchmm2m.

Once you start with some examphes below,9these con6epts shou7d ma0e mo7e se1seo 2lt’utluhtdn670lsdybxa7tgmiroio58w5vysuu8 s58ztr2rehrs7