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.
From Toby’s Blog
- “Now THAT was a good meeting!”A single effective meeting can change the course of history for a company. Imagine if you could lead effective meetings EVERY DAY! You can, but it takes curiosity & practice. This article is a good place to start your journey to a more effective you.
- Never Respond to RFPs & Custom Proposal RequestsY'all who work at normal 9-5 jobs don't need to deal with the B.S. that is an RFP process (or rather you get paid to deal with it). But us freelancers gotta deal with a whole big bag of schtuff when it comes to custom proposals. Here's my quick-and-dirty RFP filtering process that I use […]
- What content should I put on my homepage?I see websites as one stop of many on the sales journey, useful to help get customers from Point A to Point B in the sales process (or maybe from Point D to Point E). If you are wondering about what to put on your homepage, start with these basic sales-related questions: Who, specifically, will…
More posts from themightymo.com
How to Connect a GoDaddy Site to ManageWP
GoDaddy owns ManageWP, and, strangely, they make it very difficult to add GoDaddy-managed WordPress sites to their ManageWP service. Thankfully, there’s a quick workaround: Visit https://yoursite.com/wp-admin/plugins.php?showWorker=1 — This will make the ManageWP “Worker” plugin visible. Copy the connection info from the ManageWP Worker plugin. Add the site per-normal on ManageWP. That’s it! I hope this…
How to check if your current page is the wp-login.php page
I realized this morning that my TMM Maintenance Mode WordPress plugin had a bug that was causing the wp-login.php page to be inaccessible. The solution was to write a simple function that checks whether or not we’re currently on a login page, and then add a call to that function in my code. Here’s the…
WooCommerce Product Image Gallery Not Loading with WP Rocket Active
Today I updated a WooCommerce site, and everything worked fine, except for the images on product pages – they were not displaying at all. After a lot of trial & error, I realized that WP Rocket was to blame. I’m not sure exactly what the issue was (though my hunch is that it had to…
From Toby’s Blog
- “Now THAT was a good meeting!”A single effective meeting can change the course of history for a company. Imagine if you could lead effective meetings EVERY DAY! You can, but it takes curiosity & practice. This article is a good place to start your journey to a more effective you.
- Never Respond to RFPs & Custom Proposal RequestsY'all who work at normal 9-5 jobs don't need to deal with the B.S. that is an RFP process (or rather you get paid to deal with it). But us freelancers gotta deal with a whole big bag of schtuff when it comes to custom proposals. Here's my quick-and-dirty RFP filtering process that I use […]
- What content should I put on my homepage?I see websites as one stop of many on the sales journey, useful to help get customers from Point A to Point B in the sales process (or maybe from Point D to Point E). If you are wondering about what to put on your homepage, start with these basic sales-related questions: Who, specifically, will…