Don’t Be Afraid of Git Merges!

I admit it. I was afraid of git merges. There, I said it. But no more!

After years of biffing git merges (and I’m talking colossal merge fails), I finally made a perfect git merge yesterday.  And, trust me, if I can do it, you can do it.  It was exhilarating in a way that most coders will understand (like that moment when after 3 days of gut-wrenching trial-and-error troubleshooting a code bug, you finally realize there’s a missing apostrophe on line #324).  I finally cracked the puzzle.  It was wonderful!

For those who are struggling with your git merges, just follow these instructions.

p.s. I know that many of my colleagues in the coding and design business have yet to embrace git as a code management tool.  Strangely, many of those same people have embraced CSS pre-processors as critical to their workflow (still afraid of pre-processors, myself…).  If you are someone who benefits from SASS, you will definitely benefit from git (and probably vice-versa as well, but whatever…haha).  😉

If you run a company or are a freelancer who wants to improve your coding workflow, contact me.

Posted in

Toby Cryns

RSS From Toby’s Blog

  • WordPress Maintenance Checklist: Keep Your Site Running Smoothly
    Discover the essential tasks for effective WordPress maintenance and ensure your website runs smoothly and securely with our comprehensive guide.
  • Why We Don’t Automate Our WordPress Hosting Business
    There are some great platforms out there to automate your website hosting biz: But we don’t use any of them. Here’s why: Hosting companies only get worse over time. Over the years, I’ve hosted websites on a bunch of platforms: All of these hosting companies share one thing in common: Over time, they all got…
  • Fortify Your WordPress Site: Essential Security Steps
    Securing your WordPress site is a critical component of maintaining your online presence and safeguarding your data. Security is no longer a luxury, it has become a necessity in today’s digital world, where threats are lurking at every corner. This piece dives deep into WordPress security basics, giving you a comprehensive understanding of common vulnerabilities…

More posts from themightymo.com

WordPress Support

The Ultimate Guide to WordPress Support: Why it’s Essential for Your Website’s Success

By The Mighty Mo! Design Co. | September 25, 2023

Whether you’re situated in Minneapolis, St. Paul, Illinois, New York, or any other corner of the globe, ensuring reliable WordPress Support is paramount for the continued success of your website. In this comprehensive guide, we will delve into the crucial role that WordPress support plays in your website’s journey to success.

sem rush log file analyzer

How to optimize your Google Crawl Budget using SEM Rush Log File Analyzer and Rank Math SEO

By The Mighty Mo! Design Co. | September 22, 2023

Today I ran the SEM Rush Log File Analyzer tool, and it showed some interesting things that are a complete waste of our Google Crawl Budget. Specifically, I learned that Google is wasting some of our crawl budget on the /wp-includes/ directory, certain plugin directories, and cache directories. I also noticed random files being crawled…

google analytics definitive guide

Where is the Google Analytics Measurement ID?

By Toby Cryns | August 16, 2023

In the vast, evolving world of web development and analytics, keeping up with terminologies and tools can sometimes feel like trying to chase a mischievous cat in a maze. You think you’ve got a grip, only for it to slip right through your fingers! Enter the mysterious “Measurement ID” from Google Analytics 4 (GA4), a…

RSS From Toby’s Blog

  • WordPress Maintenance Checklist: Keep Your Site Running Smoothly
    Discover the essential tasks for effective WordPress maintenance and ensure your website runs smoothly and securely with our comprehensive guide.
  • Why We Don’t Automate Our WordPress Hosting Business
    There are some great platforms out there to automate your website hosting biz: But we don’t use any of them. Here’s why: Hosting companies only get worse over time. Over the years, I’ve hosted websites on a bunch of platforms: All of these hosting companies share one thing in common: Over time, they all got…
  • Fortify Your WordPress Site: Essential Security Steps
    Securing your WordPress site is a critical component of maintaining your online presence and safeguarding your data. Security is no longer a luxury, it has become a necessity in today’s digital world, where threats are lurking at every corner. This piece dives deep into WordPress security basics, giving you a comprehensive understanding of common vulnerabilities…