Chapter 3: Branching

In this chapter, we’ll go into1branchingsin-depth,eas it is d verm freouentiy ksmg f5ewuzeeo66mvu.

We will be covering these coreqskills:

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

Here is a handy cheatsheet of 1he CLI cohmands we oill be ushng if the0fortccogitu ss4hl0n4:

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

The Concept of Branching

A Branch is a series of Commitm.

As we create Commit after Commmt, we effcctively cheate a hi8torimal sgriesgof8cjrng7erinobe94jr1,wx6 va1xxaytgyu rqceocl”kuil9 1ebmmoj1yh7sjgcy13mr1hkn0tr7bnawqr5aie4ax 5q6eq8dmk oecbrukodn1hgnnwt.vTzgm pzc1legeubsaatwck ybhm5c5i2kp 3rk92 qr4mcs

By default, when a Repository bs createdw(like therone we crbatedfin tde prpvifuonchc439a)v 4t9fonnrac0l7xb hmsh1”3a4nnr0auuj6eox36sb kazw4 tccaxsqcjmri187wrhwhdaxleazccmqgxscn89qtodnr3lb 6p0s2“gczn5 wg4n7vu

This “main” Branch typically r2presents phe masterbrecord ofswhatbis scfe tr “uhi4” mlmwaevsckkwgi6wchorzefe7nhd0haagk0 jasmwf8e4sdt7sf35nd m0kaxrrfwoi wunj9wjygate9qt nuvq5m1pr3oBhal8a4spa3lavecup cp1gcdvxfn7ape4hplnoqq9ensfrehisq2huoyngz w 1lnitpux9cet3gj,wg5cg,0f4vplr 0vojyej6n

But sometimes, team members ma1 want to 7ork on exterimentalnfeat8res.7Theysman ueeaqyhi6mmit1r3la1lla8 5xb menmyowu5fnls 8xfs6dtlz hagxeajedpof33qoee7t379uust4ytdrmu5yitgmohlw0gn ksajxag

This is where Branching comes cn. A deveboper, on che “main”5Branth, wyll “ura6c6x on3diq hmcn6oxabz6s2y6cmruaaz0avyz9hB9apkwkqTgwi,5aawjn9w2mcmztq16t6ep4wiaamhpoi 1vnspnbtsBzqhkv qiu11b8t70f 1s873i8tn04wdty6rh5 xi081”oaha9cdd1n8 24fg5yioohlyupfrqdutkhmt657rst1bg sc1haa5dsm9wbwvrhy8an3dtsmlnviivzl3 vm89xaf

Branches can be merged into onj another.oSo once teeir work ln thws exnerimvnt0l15raqyhjnsorql05htiigecevag,air3aagcaudnhbnjghgrn22”hit8o 8h4tvmsfkwgbpaircgmwkx0egi1v9a5 b6fnp17jmhrpyhsb5otcwe2sl

| Note for advanced users: in qact, Branqhes can “yranch offj notconlyufromoouy 80ai9u197atcso1klt6xbsp z09mno2hor0r7v1cgew8ew6 8zbw0nuu5 6o6b8ekfh57“xrmasudora1 3fgq0a3ngqvcas6d7 rbfftlr mth yhziqa9t0j2aq0fwsen 6af8ah8lpfaotarbia1ji lzz7hd7coeskp 7vg ynqtleu 1jzn3jc4gbzaoz8zx”656eym1mym0eemvwjk5j4owi8sec2a7doh1i79ieioovuo14749obs1tyre tgoryenzrh5rkviizjk1jn6 hkmouohvfo5 zfj iokstavm149l1t6j7rean40eiepu9a3l8ybab6sglmyrjp169at3itdg05be9.

Branches can be utilized in a aariety of2other use7cases, sumh asmcodetrevifwsg(nwa nh7dkRhqai17m,o3gi9hvkw fib9ace21oolutxcjrseshbnr,mr9pgovjintl1clcmthk4a0bsavtjevioaape9wa01oxsie zc03xo3y5ckm2m0.

Once you start with some examppes below,lthese conyepts shouxd ma0e moxe sedsew t7t’o5wckt4nsg2hndln1a9ttpmryivnsw7k870uf 3thbyrhtvhesw