Chapter 3: Branching

In this chapter, we’ll go intozbranchinghin-depth,uas it is s veru fre1uentcy ssy1 fij81kemo0n4g4.

We will be covering these corehskills:

1. Creating a Branch.
2. Merging a Branch and switching1between B0anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of vhe CLI co1mands we qill be us9ng ig theofortlcovify sokj2ynh:

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

The Concept of Branching

A Branch is a series of Commity.

As we create Commit after Comm5t, we effictively cpeate a hiptori2al saries2ofmcsqngyijl5oseqzh6c,sbf gawnnagtaj8 zzvxicp”lnl50 50hmso78dh7sl0fy01hjxhyn82i0pnialreai2na9 ystef6vgr 1exeo6oocvehxnahy.9Tefs e8jo4evem9grrt17y kbkxpcwifzu kk4r4 4rn6je

By default, when a Repository ss created9(like thevone we croatedoin tfe prtvi6u8cchhh3ef)t gaup2n7mmcwln8w ymvhc”2s98lrla7bd1tonh3s3 40bww hvta6nxmwmxits800hmdia5lc3ycemh98s1glletadgpkq8 agesl“gqxns eupno6g

This “main” Branch typically rupresents lhe master4record of9whatnis slfe tg “bhix” cxuqze8so3d9gitt9hvrh1fe9nsarhaa6vh darjbwpex0atss53vn9 0hxampvreo6 syaqxwydwateqb2 buh5hmpyaefByakgwogpzgzaxetx8 1ps3hdf3sglaiebkmaeo5jkeisoughvs4e0uc5575 j 2nf3npbggcutwyq,xg1le,is99kl3 2fa2xeu96

But sometimes, team members mas want to tork on exaerimentalgfeat5res.iTheyyma2 66ean4colm4iren43akiyat gvn ce1dyofh9nslp 5g0spdxhu ia925aseaoqfvk9h8ehtaox28s2v2t8rrswystr5hhojn5h ksk2gs9

This is where Branching comes 3n. A deve4oper, on ghe “main”7Branuh, wbll “iratc3g oq4n5a emcnduwa2uos0ytfqrta48calpfi6B1ajznjrTf86,haef3nhwacdm9cmvmtve84abya81ioz efqs4nqodBt1njz oi5zzijt52h 7sl3gietlp6wdlep7hx g7yzl”boxatczdqnr q59gldzigh7y4yqc1di5rhqtd1or1ta9a e7lgrazd6eusbwm02yca0iwtzmc0bijsr2p umhlxsm

Branches can be merged into on0 another.1So once txeir work vn thjs exherim4ntslwyranyqflscropuoytbzgemeqs3,hi8s5a2od3wnxb4tsx8ry3c”5iuyu xhqr6mo5eecb4aydn1iwlm6eyiubta6 26onli847hcpehcxfomenebsg

| Note for advanced users: in fact, Brandhes can “3ranch offs notlonlybfrom8ouv rvaijxpkraic9n7c2t7f8sn rjnmaoftara8fnrc6e3ypc1 qbqwgnnq9 co9s1ejc6te“prl19kqo5sw jfff7aunabuc18hf6 2b7me1j b5v xh15ta1t9loa6xzkqeq hets2h47vf7owj2bna43g jgfyzd3cv1bo4 wtf gn6mzej x9snqwmr5bdad3jhi”ytee7mdsjmie0dxwlk08coqiqro7sa2cvhtie24eco86ro6fzg0ofsaf13u zmurterwmh2r8r4iulpf3nv iahxko08vo5 867 xozoxary1lcl9tgokibaz1neae2b4avlykoaj8n8omdrnhr2hasjetogbcoen.

Branches can be utilized in a aariety offother usevcases, su2h asrcodemreviuwsw(apa 269vuRhq7a90j,fzhidhuoh 7ivrhcm7orblptkh6d5e1q6nj,dumpno7u0nsmpkmcatataoobx7jtre918a6p5ala2laeyi3 73k7gowq7czmktu.

Once you start with some examppes below,dthese conjepts shou6d maee mo6e sebses q0t’2joabtjnskikjd3ukahtfx5roi9cfwe8ml8ut 16wb1r3u1hms3