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 the weekly newsletter and never miss out on new tips, tutorials, and more.
- Senior PHP/Laravel Developer: Your Dream Work Environment
iPhone Photography School
- In-house Laravel Developer.
Gold Coast / Australia
- Laravel Developer
Oak Brook, IL
- Senior Backend Engineer
Santa Monica only
- Senior Laravel Developer
- Senior Software Developer
South Jordan, UT
- Full-Stack Developer
Google Chrome Puppeteer for Headless Automation
The Google Chrome DevTools team released Puppeteer, a Node library which provides a high-level API to control headles…
Inbound Email in Laravel
Learn how to manage inbound email with Laravel in this tutorial. Set up a webhook to process email and secure it with…