Learn how to fix git conflicts with git mergetool and filemerge on OS X.
----------------------------------------------------------------
FOLLOW US
• Newsletter - https://laravel-news.com/newsletter
• Facebook - / laravelnews
• Instagram - / laravelnews
LinkedIn - / laravel-news
• X - / laravelnews
--------------------------------------------------------------------