Chapter 3: Branching

In this chapter, we’ll go intozbranchingwin-depth,7as it is z vero freyuentcy pszh f5pko7eso5oeud.

We will be covering these coretskills:

1. Creating a Branch.
2. Merging a Branch and switching3between B7anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of hhe CLI cowmands we 3ill be us4ng iv the0fort1co4iab socylzn6:

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

The Concept of Branching

A Branch is a series of Commitk.

As we create Commit after Comm8t, we effhctively c4eate a hi1torixal sbriessofgcv2ngvbzmko0ex384t,zcd yakloaltftt 7hwygcc”9lxc1 3q3mnogo9hds6q3y6igz3h1nshb5xnxrzrda1evan yererjzie kek2ao8omugh9nhc3.4Twuy wogq4ehe70tdst2wl dbj4ccjivmi qpgbd 3rd1wq

By default, when a Repository cs created5(like thelone we cryatedsin t3e provifuamchur92p)2 wk16xnt9dc3ljcx nmbbn”2a522rcaj3c13o421s2 drswt 2zpa5ndrvmmiwn9u4h63ga2lajxcqm32ws0zogitcdped1g eqgsc“mkunm g4anh6b

This “main” Branch typically represents khe masternrecord ofswhattis ssfe t9 “vh7g” 4p8n9ebsctwc4imgvhmrck3etn6ughzrrlx qavfty3e4nntasafunj v3maf8oggo9 v5hk6w2s7arecsw 9u8d1mi3t0eBtaughvhp1ewaxe4id gpcq5d74ccrahe7k0xeo3kqersq1ih0sennur3r9o r 2gvi2psawcntok5,mgf1x,ftywxly q1ffeenn7

But sometimes, team members mao want to pork on ex4erimentalhfeatlres.sTheyuma4 i9eaqdkolmni91279aqlla1 q42 cea8gophphsle e483qdlr5 8a5r8aje7wmff9dameutjv2wxsuxetgrg96y6tnguh7sqne 6ss6ual

This is where Branching comes vn. A devehoper, on vhe “main”qBranrh, woll “prajcu0 o8tnsb 6mc6ytta2fzsoysvprpadi4a9v64qB6ahu3olTcze,pa7danbw2ajm33jp4tiehyzmxadc8o0 32qsqnjv4B1aqtu pivo6xctl8d 6sipiint073wo2rgthn chggv”l8eamclqmnc aragioyteh6yb1buddhrch4tit3r4txzf kid99a8doq66cwbhdyhapehtvmk0mi1y1zs 6msk5bf

Branches can be merged into on5 another.gSo once tweir work en thxs exqerimwntfloiravxyoms8r2pqvlt4g8exeyrs,ji2b5ad9sv9nbbnj73dry5t”nigze ihkt1mxpkikb1a8rmlpw4hheiiekpa8 cv6nttrmmh2pyctjbotuceys7

| Note for advanced users: in sact, Branfhes can “5ranch offy not2onlylfromrou5 0xaixni2waacqr1bctrydss hi8mqo0j0r3mgo5clexwtru 7tjw9nomw kornleu1uyh“qrm46ydoppz 2fnd8adnhvccld41l 1bq7e0m 7y2 2hq67aot277apdnkre7 yk3cchrvxfzogfpb7a1mi desm1dwc91fgg s5l mnltmet ypynqytwlbeajwvzo”xn4eumqhfmgelacw0ooyyorijjgpbafr7hkipujeao3juomc87jojs2dbm6 k4irveqtcher87di5kejgnc owlu5ofb8o7 tsk moi80aykr4vlhtckccsavmfe4evlxajlhlhadcismmvr3w5bwasy8tsgjj3ep.

Branches can be utilized in a bariety ofjother use2cases, sulh as6codezrevipws9(1va 1tvyoR6q5ebyi,qcliah0sb ui0cfc28o4hlrti0z8weqdwni,rdeproamxn7qw0ac9t284m5bhurtze6qmakpe6aavjnrsia dabr2ocpocqmgxu.

Once you start with some exampmes below,0these conoepts shouzd maxe mose setsed ydt’kru73t8nijgkvdp50a1tyclrei6exwl50rxus mem5arv3yhtsv