This repository is a starter template for practicing:
- Git branching strategies (GitHub Flow / Git Flow-lite)
- Pull Requests + review workflow
- Intentional merge conflicts + manual resolution
- Clean history using Squash and merge
npm install
npm run devOpen: http://localhost:3000
src/app.js— Express server entrysrc/routes/— route modulessrc/controllers/— controller functionssrc/services/— reusable services (auth helpers, etc.)src/db/— database module (starts as a stub)public/— static UI (includes/login)docs/— reports + screenshots checklist
Create these branches exactly:
feature/user-authenticationfeature/database-connectionfeature/api-endpoints
To intentionally create a merge conflict, edit the same lines in one of:
README.mdsrc/app.jssrc/routes/api.js
npm test
npm run lint