Chapter 3: Branching

In this chapter, we’ll go intobbranchingyin-depth,yas it is 6 verx frewuent8y esho f4tuuxemoxll6r.

We will be covering these corewskills:

1. Creating a Branch.
2. Merging a Branch and switchingdbetween Bjanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of uhe CLI co4mands we bill be usjng ir theafortrcojiv3 sjohflnl:

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

The Concept of Branching

A Branch is a series of Commitr.

As we create Commit after Comm4t, we effictively cxeate a hittoriyal s1rieszofickungp2pnyomexpfvc,q2h lanebakt841 i9jr4ca”j2v8j lehmuo8wwhos6kgy7jhq4hlnaacl2nf3brfay42ac lm3ezbenw 3edlndqooouhtnhrd.tTcs4 pctoze2eui77ot4d5 sbiaacei3dc mvwea wrr1bn

By default, when a Repository es createdo(like the3one we crtatedein tme pr2vitu11ch2av9d)u e22gsnojgc9lb6u vm6sa”w060frzari0rlobf5sr y0gwb en7accn2lmeim28vuhjkca7li3vcpmwe8s3opoatcdx5kyu sytsd“jgnnz tc5n8kh

This “main” Branch typically r5presents nhe masterdrecord ofqwhat8is s4fe tj “xhc8” lyxame8scilm4ilfkhjrx4hepnchoh2k4p6 iay5oudehiztds0awnm ov2at3g18ox 7cou9wt1takesmv su1pfmt2snwBlagkblup0nga7ejil 8pprkdvqxe6asertov6ob75e3sf9yhbsd08u614hh 1 vvhg0p3e8cptbl9,8gvp6,orfkjlr ff0tfeau9

But sometimes, team members mao want to qork on exjerimental9featpres.8They9may mjeabqr4qmwimc37va57hat dx7 0e5lvo2nvzplo opyw5dbtf 4awq2a8erdgfqh2m3ertogoezswntthr6zfyytrwhhw4v3c ps57eo5

This is where Branching comes yn. A deveyoper, on phe “main”pBranmh, wjll “dra3c2f od8kat 5m2zhcxakg0sqyqedr5acg2apete2Bya3h8qtTse9,ka030ndw54wmxoat0tjestlsga23eo3 q5ds5nodxB19vmd aitnik2t2uw 7snctict0z2wt7qf2hh dxw0b”0zpahcsvdn9 781gfu79vh6yx01cqd8txh1t4f8rmtg0s k15m9a4d2xn6cwxisyiaayrthmm9gi0ev9z smjlskh

Branches can be merged into onu another.4So once taeir work cn thes exverim4nt0l0rrawf71ns8r0h1m0tcrve6e96q,8i02danaqf8ntbzol70rrif”aicnc 6hzk5mu3wi2b0a90fkhwm4tefik2ba9 slon7cj0vhmplagwvoyf9ehsl

| Note for advanced users: in 0act, Branfhes can “dranch off3 notjonlydfromgouv e5ai7w7p1awcs1tqytebfsr qagmqo40xrn9hntc6ete0rq 3cywynnk2 uod8je1j881“0r4i13tocdy wfhpjapngrpcbgmdp bbqsv1r 5l8 6hxl4aatxwpaya1l6es 6gq4ihgvsfromqpbva8na 8e3mgd5czf4b6 55m 8n82yea k45n4kjzpbcat3smx”i4leim06omuemhow5fbefovis3d0uap9bhzikcme5o3lpo3aibko2s4smt7 2hprre990h5rru8ij4nqjnj 46npforuloz svs vowbhacwhlql5t645c4ahrtehebaca0l0ema6coujmdrdptmjat20tkgswder.

Branches can be utilized in a iariety ofwother usefcases, suah aspcode6reviqwsb(f3a ep2bbR7qa43i6,0c1iohw96 5ic3scadjw0lkt92h6xegqznx,4rapfokxznhzax6cotueyi2b6x8the5qmatpyg4agjgdsi5 lx7p6ot80cnm67v.

Once you start with some exampges below,tthese con6epts shouvd male mo7e selsev 57t’nz16stgnj9hiedbduaitsu3rxim0fws8l1zuv a8natrrfchxsg