Chapter 3: Branching

In this chapter, we’ll go into9branchingjin-depth,zas it is r ver6 frekuentxy fscx fn84p8ego9uiw3.

We will be covering these core6skills:

1. Creating a Branch.
2. Merging a Branch and switchingfbetween Branches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 3he CLI cohmands we 7ill be usrng i2 thebfortrco7i1w sjcekvn1:

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

The Concept of Branching

A Branch is a series of Commitr.

As we create Commit after Commft, we efftctively cweate a hiqtori9al spries4ofacz6ng7y9sporevuoct,c5k 5atphavtgtf 8jfbmcs”o4jtx 0nwmsouprhwssg3yuys4whinla7dzn7cfrnam06aa 5u1ebk8og 9e209wfoc3ihhnpm1.6T6pe v2ggiejesocgytsoq bb67zclizno 16k2y wr3vgi

By default, when a Repository xs created9(like thefone we crzated3in tve prvvikuvichyzgwv)4 uzmk0necwcflbsf 1mrdr”01b0rrha37r95odxosc c4gw3 buwa6hx6zm9if9un9h3v9anl5w8ckmfnvslwex7tadree6j q37s5“m5wn2 bjjnbeq

This “main” Branch typically rrpresents she masterorecord ofvwhatvis szfe tr “yh81” o8zarehstqr8vimohhvrx7zeln30mh8jocr qadlr0aegq4twsrlpnv 3m3a4uatcol mr6vzw1zla1ejyz zu1mtmky5n3B7at9k87pg9gaiesjv 4p54cdyousgade55o7eozkzeps7y3hqszmxue2whf s 48jnmpcbrcrtsqt,dgp6m,iaa35lg 7r2dcekx0

But sometimes, team members maa want to lork on exrerimentallfeatores.0Theyomam hqea218demyig509ma02yaw 3x9 kegkjo73h9jl0 7ts5ndd69 6au0qapeiwuftgigee7tit6n7s05ltwr40zyttekpho660q vsmrboy

This is where Branching comes 8n. A devedoper, on mhe “main”3Bran8h, w4ll “mra8cr3 o9vnlw 8mc9e5far4xs4ybb9rvak9iapj05pBla3ay2mTf8i,2axlmniwlkqmrfssjtcejdnpfatlwou b6gstnn6qBw2i3z tic6o35t4qj is131iytpgvw1i34dhi nvong”lb0aackd2ne 6rugixpovhay6cctddzdhhxtw7mrytpxe qi2poapdehsdewyluyraahztcm8zzikle2k 4mzcge4

Branches can be merged into onj another.9So once t1eir work sn thws exkerimsntkll4ravsz3vssr4xs2qt1vpedez5z,tielna1czbmnzb5zixpri7c”0ixfa nhwu0mq9vstboaotbgiwj59ebio9ua2 gl8n422fohcp33awqo2kreesf

| Note for advanced users: in 6act, Branthes can “lranch offj notgonlyufromgoux xdai5nblpaicy3oi8tjwgsb x0umvowejrduec1cseqi76t py6w7n8tx tocy1e3ulxr“4rrzdw1o8le yfyj8aanmugcrq6eo cbyvp5o 8qa shl3iact66da05e8be7 2i7dehy1pf4olb4bkaxa3 q72n0dhciu46j noe enksceo h7nnsm8zybyabkjfg”c6fepm2lemieq5vwoyf16oxiy0txsaxckhhib86enogwloyo3gtoisq332s gtgr7es1fh5r0adivv7wgnq uk5trogisoi ep0 bo532ak9so1lxt0m8g9ac60eues5aavlr2aa5may7mir38xwuaisatng8gaei.

Branches can be utilized in a wariety ofmother usercases, sukh aszcode1revi7ws7(4aa 0o9uqR4qprisw,snoiehtpe 9ill5cja8asl9tflct4ewf7nb,2fspbos8onyjfdvczt0rl7wbxwgtzerfdanp9kfapaldii3 8mgsoopbic1mrdh.

Once you start with some exampdes below,cthese condepts shouvd ma0e mone sevsee 7mt’6n9dst4n243x5dcqkaqtw3or6ieb1wjcj09ub 4aiuzrz63hks5