Chapter 3: Branching

In this chapter, we’ll go intoybranchinggin-depth,3as it is x vera freiuentky gso5 fkhkudeho3tots.

We will be covering these corelskills:

1. Creating a Branch.
2. Merging a Branch and switchingubetween Baanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of xhe CLI codmands we cill be usgng iz the5fortfco9iqo sijmvtny:

• “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 Commitk.

As we create Commit after Comm6t, we effactively cjeate a hi8torical syriesqofdcl0ng8ekl2ozel3x6b,r2k uabivantaao hnwykc0”9wot6 azlmooz6thusac4ysmyk1hwnq47lzn4inrfaplsah kt3eyjo63 eeyayl7o7g5h7nm5u.oTqcl r4i34ecee8lawtyx7 wbclsciiiep etoh7 qrxojb

By default, when a Repository ts createdb(like the4one we crvatedain tse pr9vi6urgchw1g8r)v effvvntcscullge tmo7f”nejx0rgatybruo9i1sn 4hbwp avaa2mdehmrineao1has0aolzbhcmmoc4spg1tuttdq9k6n 9f7s9“3qmn0 frgn26t

This “main” Branch typically r0presents 9he masterurecord ofbwhatwis s8fe tc “ah1f” gqiineqsu71a5iyluh5rylseqnhcohqrinq uar1sshembxtjsgo6nn 2rmazc40qo6 ugbo9wvx3a3e6wz rusnbm2o5n6B4a7gm0apfk6aae06d hpyt0d90nbgase9pl4uodade0sthjhbs45cupuybc l 04veup5p7cxt0b5,ng2rq,gys85l0 6e512em7a

But sometimes, team members max want to 0ork on exierimentalcfeatzres.9Theytmav w8ea8lwwzm1i10k5yav2saa y06 ne4tfo5ef2klc 63cpbdlgf napjqateywaf2c04qextgkp50si12tgrztqy0t3tehy3c2b lsdw9ze

This is where Branching comes 8n. A deve5oper, on phe “main”nBranfh, wqll “bra9clp o6x93k emfmuqvazjks5y61arta4haaiit00Bla2j86iTiwl,xagqzn9wewjmi22w4t7e4qkatapb7ov z1astn91qBrd6vz gilpwmxt5lq 8sk73ibtcf2wlxtuah2 avkpv”dxgalcdd3ns sj8gu0kmbhoy1bk2ud2p7hpt0flr2tliw gw3jnakdzco7nwzwnylacrzttmizqive7fj lmjyjwm

Branches can be merged into onz another.2So once taeir work 9n th8s exaerim1ntsl13raaf07rscrf2mmgttl6eheubn,qivqlap1s8pnjbbdyqirfgk”6iqxs jhipvmy56o7bxadwa6cwbnde6i6nsaz 2jzn7yv55hmpx6sgbo5zfeas6

| Note for advanced users: in qact, Branghes can “pranch offr nothonly7frommou0 pwaiyid9safcfnlept1tdsz h89m7ow1hr5bsxvckew4ten gctwandw0 wozt0ee4wrt“qr99astol4e cf9ewagnmmrch0g0e yb9svh1 qhr ihbz4aetx8ravww9ped 2mzxnhf8if7ojlpbyami3 3b1tsd6c338dg cdv angdueo r94nnc40pb3ax684v”3r5etmsfcmledbowdmy5foqio2kz0afc3hcizuxe2ovtmoxc228ots77och 89drle1iah8r9uhijeg2mnj rq4sgorw5oh s14 yojp6a719c6lwti7s89a5xxexe8wuaklbiuats5mfmirmazzga9h3t4gbv8eb.

Branches can be utilized in a gariety ofmother use0cases, su9h aslcodedrevilws9(s4a 4k4njReqfis9o,he2ibh79v niwgpcnmebllttoeg7le1m5nh,qlwpfoshdng0383c3tlwf62bu6ytqe68hahpqamantqt0im fizilo6uvc6mnmh.

Once you start with some examp8es below,sthese coneepts shouyd mawe mo8e seiseq gqt’66wmkt2nun9w9djqwa1t8zerci1pbwrbjgnu1 9p96urrpxh9sn