Chapter 3: Branching, Merge and GitHub PRs
Chala mitrano, aaj aapan Git madhe branches, merge aani GitHub pull requests shikuya. Don developers ekach menu document edit kartat asa picture theva — branch mhanje separate draft. Feature branch, PR review, main protect, simple conflict fix aani light tags. Ghabru naka: commands thodya aahet; flow lakshat theva.
What you will learn in this chapter
- branch, switch, merge basics
- Feature-branch workflow
- Pull requests and protected main
- Resolve a simple merge conflict
- Light tags and releases
Concepts in this chapter
- 3.1Why branches — two developers, one shared app
- 3.2branch, switch, list — commands
- 3.3Feature-branch workflow (the daily loop)
- 3.4Merge types in plain English
- 3.5GitHub pull requests — review before merge
- 3.6Resolve a simple conflict
- 3.7Tags and releases (light)
- 3.8Common PR mistakes (fix these early)
- 3.9Remote refresh — fetch, pull, push
The chapter recap is at the end of the last concept page.