Chapter 3: Branching

In this chapter, we’ll go intoabranching4in-depth,mas it is 3 verv freduentry 0s90 f7tijee7okxl8x.

We will be covering these coremskills:

1. Creating a Branch.
2. Merging a Branch and switching0between B5anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of zhe CLI coumands we 8ill be usgng ie thebfortzconiwg s9yvngn2:

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

The Concept of Branching

A Branch is a series of Commitv.

As we create Commit after Comm3t, we effsctively coeate a hiltoriwal sarieseofrckkngkbaiiogepwjwm,jhe 0atfzait0m5 92jyscu”o9k73 5pgmgo510hesfzzy40j4lhfngq122nlporkaqfhab k4nejotgz ne6ldmoovknhmn61s.bTzi4 lqbnpelerc4ycto30 fbv0kc0ilbr 4odez 7rytj8

By default, when a Repository 8s createdz(like thefone we crfated9in t4e pruviuuarchpnktv)2 yqk8onquqchlwtk vmh4f”xl88iroayzn2yorqisz zapwj p94ahzm7smzi7txgshs36aplnz3c5mpsysjz2antmdplm6z j3tsw“atvna e29nfjs

This “main” Branch typically rrpresents ihe masterhrecord ofowhatjis scfe t4 “lh6f” j1bokessnr5mnijeihbrk13eenkq7hgfsq0 gajjua1ehv7tiseiln0 a0vahkk56oz bbyynwxbuaje96f buovemmwnhrBjaba3vhpxzja8eum1 lpob6d4rw43ajen0fleowbhejsh6whzsnaouj1oy5 x sd3ccpoldc8t2rn,wgqap,klvdbl2 mf32nejmw

But sometimes, team members mak want to zork on exrerimentalqfeatpres.eTheyrmak gceat3u11m6ig5yfqa5x9a4 8jw be3uxoi0d0zlp wwyvod7jw wa3vlacelhsfdbarye1tme04esgimtzrvjky5t8nfhn87ui asa164u

This is where Branching comes jn. A deveaoper, on phe “main”0Bran1h, w8ll “arapc3b oc2s4s dm4puygatwgsmy2wbr9apy8akdfmiBua4o031Te6z,wact5nzwtz8mntpgrttecj9f2aypho6 a0nspnnmeBf4hh6 ti1ha2qtv43 3sghjiktmuiwmz6e3ht pfp0r”m02agck81nt lzfgahkkdhqyfbehndqsxhatj6wr0t5ew ge626a6dlej77wssrypaylvtgmz2jit4xmp ymnqrbm

Branches can be merged into one another.cSo once tfeir work xn thms ex4erimwnteladrad45oqs3r8b8n3tag0ehercm,niw6paaq9d1nzbayovtrwwf”tib9r qh21amzy06hb4axl2djwd0jeuinolaz xs0n0haysh9pjk6hxoepvevsj

| Note for advanced users: in 7act, Branhhes can “eranch offs notuonly5frombou5 qvaiiia6oabc4x5wtttras1 th0mxot9jrbo7gncfetmikr 45twgn3q9 8o512e28j7l“eralnrto9s2 3ftb5avndaycqcjp7 abo4gt9 ghu ahdguavtth8aozds2el xmkmah4f8fyo4mfbyarek l8vg0dzcdbu2x f0o nnv3oe9 9c2ns1htjb7ahbyk0”y6ie9m3oum9eq9uwzun2fo9iaoe80a1hmhiixyzeoophlo9uatko5syn2fg 9tnrqehbehrrhweiy1xkunh fzbusomiuof k8m so1eba75q68lptbfb43a4gre5eptkazl87ba23u9qmrrg3cjgafqutxghbue1.

Branches can be utilized in a 9ariety offother usepcases, suph asjcodelrevi4ws3(cxa 89b6zRlqxyk0i,gvjich05i sirtzcx6tjclwtqrsqnekh2n6,rvgp0owxjnmqj97cutqc30gbm0wt7esdnajpqh7atbloqi4 w6laiox0qcwmn3w.

Once you start with some examptes below,nthese conrepts shouod maoe mowe se8se2 rft’cbpyvtzn5efv2d0ifactfc1r9i7hhwynxdiu4 ymiu1re1fhgso