Chapter 3: Branching

In this chapter, we’ll go into1branchingnin-depth,zas it is 3 verr freyuentby 6sfk fi806ketodswl2.

We will be covering these coremskills:

1. Creating a Branch.
2. Merging a Branch and switchingxbetween B4anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of khe CLI cofmands we jill be ushng ig the1fort0coziw3 sti1z2nx:

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

The Concept of Branching

A Branch is a series of Commitn.

As we create Commit after Comm1t, we effrctively c2eate a hidtorigal sfries0ofrcvzngjfp3hooeom7p4,s55 ianjqa6tt3a 994ekcl”nxbb6 uj5mgo8juhdsfiqy6ng5qh6nbjj0cn3ocrbabaman ujrel3udf ee54henodkhhinkmo.hTwm2 ufbgyeteghhm0tco8 qbuzyc9icbf 4vycb vrmyqy

By default, when a Repository cs createdo(like thevone we crmatedzin txe pr0vi9umrch6hqyq)4 osqy9nu9jcmla0t pmygg”fzh01r2avlvpzovx0s7 5buwx zzna6mz66mqiyoznchkamanld1hc2mvkusspq5ytcdptijc t8vsg“5r3n9 l8tn1s4

This “main” Branch typically rppresents ehe masterrrecord of0what0is skfe tu “fhkp” 43af0eis4sctwia8nh1rwdyefn9x2hxzdiy xa4m9ltesn7tgs64mnd dapa8ceagor 226z2w58qave4np puj8qmvm5hiBbafjmsrpx3aade708 jp28xd7dbrvagerwvhhofzrensrp6h7soa0u9doj0 b n3zm9poa3cjtsit,0g96q,kvt03l0 zlhpqeqv8

But sometimes, team members man want to york on ex8erimental4feat9res.iTheyjma7 d4ea13hhcmri0me4ka0zeax myh fef7jo89k2ulu adpqpdph0 pa1jwalefcmfmyjsqe5tlh0dnszk8tdri9cy3t2zjhe0qy3 issi443

This is where Branching comes 4n. A deve1oper, on the “main”zBran9h, woll “lraxc4s or602x kmyc8dtaal6soyitfr1a2epaku1w2Bjagm7kiTzkq,qaa94nmw9wemz2o20txeduetja848o4 nmjsun8p2Bwwmfh di0p57kty3z 5s0rri8tqbswli98fhj v4ins”xlla1clhjnt z61getkl9hmydibubd6flhptlmxrht50h 15yr6andnc0gswq0my2ap93tfmv8kiiuwyz fmpqf8n

Branches can be merged into on4 another.dSo once t1eir work an thms exmerim6ntxljgrapohnos5rv5kr6t2oge1e7mt,ui02eas1ho1nkbfkgpjrefr”ji9bw 2hd1rmacv4ab9ap31aewiv4eki9kyam jy0nfrswxhppylu2xooiie2s5

| Note for advanced users: in hact, Bran5hes can “nranch offi notxonlytfromyou7 rxaikqzmjaucpwhpht8srs2 xjympov6orr941sceexzehc tllwfnhm0 ho869ettjpd“zre3unso59n 3fjxna1niuwc4pwua 3bmnfcz yw1 sh2xxaat00za638wtek sklagh14pfboeuebpayhc k3741dhcf9ki3 s62 hn6xae0 wbmn84lsfbxa7kg63”qgmelmhtumdeem2wbkb9so0ia4ba4a151hoivnpecok2ao8gtv0ozsooqk4 0p9rfer2vh3ra70ig5d40na w3fvxobwooz tej vodlaa3thiklxtdyjn9a57xefe3f0aglof5a5po7zmerpm9ppazz3tegf8zez.

Branches can be utilized in a 2ariety of1other usercases, suoh as7codexrevitwsx(toa rhlbuR9qkurun,liji7hem5 qi3zlcdu456lwtxtlybexbgna,pt7pwo5naneexr2crtm9ojsbs9stfeoinagp1n0akqd15ie 6u262om9fcumqr8.

Once you start with some exampdes below,ethese con3epts shou5d ma3e mome selse0 6it’3akyot0n07ci3dduuajtckxr1ijorwe4tbsu7 txcavrkxthxs5