Resolving Git Conflicts with Git Mergetool

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.

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 within your Laravel applications using Laravel Valet (or ngrok directly) to test it out locally

Embed anywhere CMS (works everywhere) – sponsor

Component IO lets you avoid endless back-and-forth work when your team wants to make changes to content on your website. It’s a modular, component-based content management system that is easy to add anywhere, on any new or existing website.

Manage Laravel Forge Servers from Android with ForgeApp

Learn about ForgeApp, a free Android application for managing Laravel Forge servers.

Bootstrap 4 Releases Its First Beta

Bootstrap CSS has just released its first beta release of the new version 4 codebase.

Ziggy: A Package for Named Laravel Routes in JavaScript

Ziggy is a package that exposes named Laravel routes in JavaScript written by Caleb Porzio and Daniel Coulbourne from Tighten Co. Learn about Ziggy and how you can use it to keep your routes in sync between a Laravel backend and JavaScript.

Watch the Laracon US Keynote by Taylor Otwell

StreamACon just released the first Laracon US conference video and it’s Taylor’s keynote. During this talk, he goes through some of the new Laravel 5.5 features and finishes by announcing Laravel Horizon. You can watch it now on the StreamACon website and the remaining talk videos will be released in two weeks. Lead photo by …

Continue readingRead more…

Learn how to set up Xdebug for PhpStorm and Laravel Valet

Xdebug always seems to be a challenge to set up, follow along and learn how to find Xdebug settings and configure it for local development with PhpStorm.

Writing Custom Laravel Artisan Commands

Learn how you can create some kick-butt custom commands for your Laravel applications using the artisan console.

Laravel’s Artisan command line interface (CLI) extends Symfony’s Console component, with some added conveniences and shortcuts. Follow along if you want to learn how to create some kick-butt custom commands for your Laravel applications.

Optimize Eloquent Queries with Eager Loading

Learn how to optimize your related model queries in Laravel with eager loading. We will set up some example relationships and then walk through how queries change with and without eager loading. I like to get my hands directly on code and experiment with things, and I hope to illustrate how eager loading works with some examples will further help you understand how to optimize your queries.