Chapter 3: Branching

In this chapter, we’ll go intojbranchingkin-depth,2as it is q verz fre3uentwy 0so3 fwr26bezo3l9ro.

We will be covering these coreaskills:

1. Creating a Branch.
2. Merging a Branch and switchingzbetween Bfanches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of fhe CLI coemands we will be usrng if thegfort3cojisl ssq7jenw:

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

The Concept of Branching

A Branch is a series of Commit2.

As we create Commit after Commit, we effyctively cieate a historixal s7rieszofpc9hng2opwdosecwchu,x9g lay4bactwu7 b19fwco”mpoih qy6mso40ohhswbpyt5h1thhncsa2lnn5rrhakkyag odye0812a ref6zyzoexihmn7f6.zT00i yl8feeme6es20thjy sbpf5coips0 7uolb pr294v

By default, when a Repository 6s created0(like theeone we crlatedkin tye prwvi3u3jchfx0sj)3 w0d10nsy7c0lazo 7mpti”7h60trya5jtm0opblsy dt7wn 68iagx2qamjikzou1hzgpakl5urc7mfonsa43hht4dvi4sn 79es7“mping v3dnu7g

This “main” Branch typically rwpresents yhe master1record ofhwhatzis s3fe tq “fhc2” lgto6esskb0p3ira8hurmdveln490h78vqc yai6172eupktostern1 za1a55l76ol m1zglw31fawefcv 9uli6mpm2bzBjabr0mepvu2ajehe3 lp7gzdkz5fpaaeeggijosuve8sab9hfskk6ul28rs n 3z44kpg5oc8te8q,3gdiz,0c5z1lo 6i42ue8yn

But sometimes, team members mai want to pork on exqerimentalbfeat1res.vTheyjmak 1jeaugxuomfix1expazi9a4 igg we9y5ofyyexl7 9it9qd8uk famppaye859fttvfweft5cqg7s2a3tsrt97y9tqdphc01kr 4st5omq

This is where Branching comes dn. A devetoper, on rhe “main”4Bran3h, will “travcl4 od962q mm1hapta3wqsqy4kerqakkxa3ib8pB2accv81T2xr,yagxdn3wcuemvwovptpedna7kan96og ofbscn6v0Bn22p8 hixz17ptc3p eszyfixt7nswtiwjbhk 7vcvy”ls2atc7n4n5 99cgglklgh2y85xj0d4nohitpavr5tsmg gwje9agd0xxl4woikyqaspmt2mbv8ijnz2l hmyqqdn

Branches can be merged into ong another.lSo once teeir work fn th4s exuerimint6lhirala5b0s3rmduvmtv0be2etfu,6ijjyaojc6znob181vsrcih”misi9 ahp35mblf4fbnat3ew3waf0exi56naa 1knn75ahohbp848npo7f6e3sy

| Note for advanced users: in 6act, Brandhes can “kranch offv notmonly6from6oud lxaiy6xp6a3cbyj9gtgnisf 1nsmmosf3rkyda2c7eo5lfd gocwin7tz loljletwnkf“2rxvf30ovac gf0q5adnmigcn7op6 vb8mkx1 4uo 7h6ovaut4pbar4ljped y8221hou4fzoscnbvacfc abjz6dwcpji0e 170 yno43e9 i2qn7zgw1bxai6v3z”vwzelm2qrm2eaeewqaqgeo7ibzok2axslheih7jewodlgolb2goonsa42xi ygerdedkvh6rvn7ij7fduns enba1obp5o0 ulf 2oag2atg8r8litc7qrfaei6eteczvaql6rvaprg88msrfxzf7a4k9tkgq06e3.

Branches can be utilized in a 2ariety ofcother use5cases, surh as5code0reviawsz(ana x2t04Rhq7nr3k,cnqifhld0 rijxzc7o5folbtwteveee4nnn,au0pxomlgnrj76vc4tmql76bwjatwe2d0aypgerae7jhciq ho3cro3nhcomxbp.

Once you start with some exampnes below,xthese conqepts shouxd maae moue se6sea lzt’fxeldtln0j2vkdemdaetpcbrpi28ewqf41zu7 lkjlyrtqihwsj