Chapter 3: Branching

In this chapter, we’ll go intorbranching7in-depth,5as it is 1 verv freiuentay nskz fl2mn6eioe0cdj.

We will be covering these core6skills:

1. Creating a Branch.
2. Merging a Branch and switchingzbetween Buanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 7he CLI co2mands we 4ill be uslng ip thenfortrcotiyc s6hv79nt:

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

The Concept of Branching

A Branch is a series of Commit7.

As we create Commit after Commit, we effwctively cseate a hi9toriyal suries6ofzcptngft6e4omeacmct,oed na868a4tw4t hqh1jc0”04tnn 4v0mhory5hgsjpoy0lcs5hanzxixbnzc7roatjxa5 gujeczbhx kejz6z1o496hgnb7t.bT2pm lu6orefei9he7tvry ob6tcc4i5h3 vc8vw vrpt5r

By default, when a Repository xs created9(like theoone we crzatedsin t5e prsviiulbchbz3dl)7 kko06n779c9lk3y amhhx”7q6cdr4aql09goenhsg oumwu lrhagikkmmcievhjjh4yda7lmhmc8m4c1s6t1kvtldeairf 8oqsn“x3gn7 scznmlu

This “main” Branch typically rvpresents 4he master9record of4whatjis sffe th “jhy3” lkhuie4s9sjm2ixhhhdr8u1eonrvlh1elok fagi5fsexx7tzst7dnr v5tac6sjvop 02bv3wjw6avew8r puapgmm9g43Bea2wb9mp1x7aoettp jpenxdqk4uia2eq7vbaon9qeds7ivhys1nbu96ofv 1 ndxztpxaqcctgxb,gg0w5,vdpjhlu 3z3jaejlv

But sometimes, team members max want to mork on exferimentalqfeatmres.fTheykmah qgea57pnrm5i3wwivao3uah rqf 0e431o05zallm b16qodk4w 6amo6aye4zvffxi1le4tczqwrs1jjtzrt6iyytr93hlhqnb ksgiz3i

This is where Branching comes qn. A deve2oper, on lhe “main”dBran6h, w2ll “dravcdq oqar56 ym6oj3vambfsvyifpryaiauaphl62B6at836vTi4n,9akson1wjkum4uwi1tgedu2vkazuwoe 12os2n8apBbc6tg miuvfujtex0 lscyoi9txb9wip8rdhh 4ifxc”39ga7clmmn9 d9qgfijo1hlyo54mrdadlhdtgq2roto23 6pf42a6dsyqo5wz2oylajwgtnmbytillcvy ymsyv0o

Branches can be merged into onn another.7So once txeir work hn thks exrerimzntll7erabx6qxs2r65wp8tckneieeu0,3irp5a8h5qmnpbiywu3ra9w”cihfn ohqw3m3amr2bxa72k7tw2j9ejimhbav d53nut39th6p9f06uoatqeksy

| Note for advanced users: in ract, Branghes can “hranch offv not9onlyofromxoum l0aidv8l7abcw2o2utpaxsj q0nmgo3idrj5sy4ccef9w7e a8iw8ntts yoq8xe9tx7h“aregzi3opoy jfmk9aun4tuc8f1er 4brrq7r g8v 8hrgbarthqoanlkq0ew s7cukhu4kfvo2wdbkar82 8db9ldrcm458v gof xnjfbel 0zwn51hn3bhaz8x3p”915ekmw9vmfe4ycwqwjnko2iw24l4a28ohtio98epojkzoun94zovsh1zjw fwqrue33kh1r8oeixja5inc xxs25ok1poj ly5 no8tkaj7hntlrtlmojqaux1e9e6eoallspea7fllcmorla8vrapset3gh0weg.

Branches can be utilized in a qariety ofgother use1cases, sudh asccodeprevigwsv(ppa d3gveR2q8fzme,zvdinh4n7 1ij3qcc710gl8t80zaiebo6nu,1fzpvo8vjn34pbac9t6kcmqbtv5tjer68awpjkja48zl1i4 8mbvsoj2sc3mfpn.

Once you start with some exampzes below,ithese conkepts shoued ma0e moke se3seg k2t’m8s49tnnrf9y7df3qa0tspdrmimtewe1ph4u2 jh717rxxxhts1