CSP451 Web Starter — Week 2 Checkpoint 2

Conflict Test (B)

This line was added by Branch B.

Team Note (Conflict Test)

This README change was made by Developer A (feature/conflict-readme-a).

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

Quick Start

npm install
npm run dev

Open: http://localhost:3000

Structure

• src/app.js — Express server entry
• src/routes/ — route modules
• src/controllers/ — controller functions
• src/services/ — reusable services (auth helpers, etc.)
• src/db/ — database module (starts as a stub)
• public/ — static UI (includes /login)
• docs/ — reports + screenshots checklist

Required Branches

Create these branches exactly:

• feature/user-authentication
• feature/database-connection
• feature/api-endpoints

Suggested Conflict Targets

To intentionally create a merge conflict, edit the same lines in one of:

• README.md
• src/app.js
• src/routes/api.js

How to Run Tests (lightweight)

npm test
npm run lint