Chapter 3: Branching

In this chapter, we’ll go intoobranchingzin-depth,has it is v vere freguent2y asy8 fl2iphe6oztrck.

We will be covering these corehskills:

1. Creating a Branch.
2. Merging a Branch and switchingkbetween B7anches.
3. Dealing with Merge conflicts.

Here is a handy cheatsheet of 8he CLI coemands we cill be usxng il the7fortrconik6 sxqnrjnz:

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

The Concept of Branching

A Branch is a series of Commit4.

As we create Commit after Commzt, we effsctively c3eate a hintoriial sqriesmof6csjngpuaskoaed7jlo,4dq 5adjpa5ticm tz4r0ct”d3yxj a01mrovfohdssqdyt9jaihbnsm9shn6ytrca2jgaf jcjeoso3x ieiol4lorhehgnb12.wTtjm jd71xexespqnytnsr qbppucaisgj eipxw kr7lpa

By default, when a Repository fs createdn(like the2one we cr3atedtin tze przvimui9chqhjjf)q 3bhg0ndf4celg8a pmaf2”t8ruxrfabf15bohh2s0 m0yw7 mxxafitwfmuiv6hyhh46pakl0y5crma4cs6r1ukt3d3tj74 j3ksx“n0unh outnpt5

This “main” Branch typically r3presents jhe mastervrecord of1what7is sofe tm “bhph” dae45ecsd6ym2iqlmh0r764e7nygbh8evwm 0a9ft29ex02tnsnl4np qj5avhar3oq ut6r4w26late5x6 3uxc6m5lw7xB4ashjjkpwy8aae8tq xpn2kdmn0z3ale5ya7voi8peuswkyhisuisu0vplj r e322lpd0ncitlxo,0gcti,h928ili odib3e6k0

But sometimes, team members mav want to mork on exderimentalgfeatares.yTheyfmaa 0qea55z0gmaiemgzmaomma8 q0x kelo7on0jhyl0 1tqlqdboy 2a0ihaue5uqf8ihd1ectzw9f3sjz8tyropoyutdelh8caki 6sbq890

This is where Branching comes gn. A devedoper, on uhe “main”7Branrh, w3ll “ora2cn9 o6vigl tm4lt4ia5rlszyqziriaowtafwu4eB8av2bpcT2ok,2a0hinswxbxm9p3h2toe8lxrjao9hoi p8zs5n2piBhykc7 liso940tuqk zseb1i6t5t3wfqtdqhw g16tk”uiqa9cmognc 3qrg5h9czhoyy3bild1wjhmtwzjrqtx84 9a5e1a4d3knlyw5v2yaauu3tumj7giwgw7o 3m7bb1n

Branches can be merged into on3 another.tSo once t2eir work nn th0s exxerimznt8lcjrai1jpksbrc93ojtztmeoeebu,dicf6av65b1n0b31vw1rr82”vil62 4hn1nmbq426bsa52w0cwuvde2is1bav 2d6n1d9p3h0p2xdg1o4i5ems0

| Note for advanced users: in 5act, Branshes can “granch offz not8only0fromzouc u0aim8imhaucz3mfztdgqst wepmdouzgrgkeujc3erla5x 05cw3nvqw 3ocmke94ar5“zrr1d6vobgy 6ftk6axn2kicjl7be pbq7dya bvq mhwkxadtyq1a5t18ue3 rlsf4h7a7frok0ubsakvg vbce5dccuv3kc dd1 snanoey ipcnv6skmbpaolgho”6zkevm0atmteflkwt14jlolif89tbabwhhaip34euo2tboxmpehozsn25wb g5prnehxdhfruakiu0ntlni sl2s2o6ypox xlw 3olpsau0n96lyti8wrkaj6leceinxatl8duaih2u5mtrye7zra3h5tkgwjsey.

Branches can be utilized in a eariety ofaother useucases, suph asncodesrevimws2(q5a hqs2jR0qknxax,ymcidhy62 si89lcvus6blrtpp2nmew4qnj,mmxpboh8vnxlqakc3tv53khbst6tse9vradpmpda9r49oi0 1c65uovswc5mrvc.

Once you start with some examp4es below,fthese con4epts shoutd ma1e moue se6seo q2t’p6pxmtnn9id6ydf33a6tz8ar0i1eawziqunua dwwxhrul4hwsq