Or try paginated search →
I’ve honed my workflow for resolving conflicts during git merges and rebases over the years. Along the way, I’ve added the git mergetool command to my toolbelt, which makes me productive while merging routine merge conflicts in git. By default on OS X, git uses vimdiff as the mergetool, but in this video, I am going to show you how to use the bundled Filemerge app to visually merge code conflicts with git on OS X.
Join 40k+ other developers and never miss out on new tips, tutorials, and more.
Get expert guidance in a few days with a Laravel code review
World class Laravel experts with GenAI dev skills. LATAM-based, embedded engineers that ship fast, communicate clearly, and elevate your product. No bloat, no BS.
Curotec
Supercharge your project with a seasoned Laravel developer with 4-6 years of experience for just $3200/month. Get 160 hours of dedicated expertise & a risk-free 15-day trial. Schedule a call now!
Bacancy
The must-have code runner for Laravel developers. Tinker with AI, autocompletion and instant feedback on local and production environments.
Tinkerwell
CodeRabbit is an AI-powered code review tool that specializes in PHP and Laravel, running PHPStan and offering automated PR analysis, security checks, and custom review features while remaining free for open-source projects.
Cut PHP Code Review Time & Bugs into Half with CodeRabbit
Expert code review! Get clear, practical feedback from two Laravel devs with 10+ years of experience helping teams build better apps.
Get expert guidance in a few days with a Laravel code review
The go-to PHP IDE with extensive out-of-the-box support for Laravel and its ecosystem.
PhpStorm
Running an old Laravel version? Instant, automated Laravel upgrades and code modernization to keep your applications fresh.
Shift
The next generation time-tracking and billing software that helps your agency plan and forecast a profitable future.
Harpoon: Next generation time tracking and invoicing
Get Lucky Now - the ideal choice for Laravel Development, with over a decade of experience!
Lucky Media
E-Commerce for Laravel. An open-source package that brings the power of modern headless e-commerce functionality to Laravel.
Lunar: Laravel E-Commerce
SaaSykit is a Multi-tenant Laravel SaaS Starter Kit that comes with all features required to run a modern SaaS. Payments, Beautiful Checkout, Admin Panel, User dashboard, Auth, Ready Components, Stats, Blog, Docs and more.
SaaSykit: Laravel SaaS Starter Kit
