Aug 3, 2025
Git Rebase vs Merge vs Squash
A practical, no-fluff guide to choosing merge, rebase, or squash without turning your Git history into noise.
4 min readgitworkflowengineering
Hi,I'mLakshayChoudhary
I'm Lakshay Choudhary, a full-stack developer focused on backend-heavy products, cloud infrastructure, and systems that stay maintainable after the first version ships.
I work mostly with Next.js, TypeScript, Prisma, Redis, AWS, GCP, and Linux/NixOS. Lately, I've been building AI-backed product workflows, trading tools, ecommerce systems, and infrastructure setups that are boring in the best way: reliable, observable, and easy to change.
Experience
Projects
A full-stack ticketing system with role-based workflows for users, agents, and admins. SLA deadlines with breach detection, a full event timeline, optimistic locking that returns 409 on stale writes, plus per-user rate limiting and idempotent ticket creation.
- Next.js
- React 19
- Prisma
- PostgreSQL
- TanStack Query
- Zod
Joy Junction storefront
headless commerce platformAn end-to-end ecommerce platform for a toy-and-games brand: a Next.js 15 storefront on a headless MedusaJS backend, with Google auth, Razorpay payments, Supabase storage, and Redis caching, deployed across Vercel and AWS Lightsail.
- Next.js
- MedusaJS
- Razorpay
- Supabase
- Redis
- AWS Lightsail
A video transcoding pipeline built for cost, not convenience: SQS-driven jobs running containers directly on the EC2 instance instead of ECS to avoid the orchestration overhead, reading from and writing back to S3.
- AWS SQS
- EC2
- S3
- Docker
- TypeScript
A browser-only S3 uploader: credentials live in local storage and go straight to AWS, never touching a server. Direct-to-S3 uploads with live progress, cancellation, and a copyable link history.
- Next.js
- AWS SDK v3
- S3
- shadcn/ui
- TypeScript
Writing