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
- Where uncertainty exists, don’t order specific.4 Idiot Case Studies with 2 simple age-old business lessons. The post Where uncertainty exists, don’t order specific. appeared first on Toby Cryns, WordPress Trainer in Minneapolis, MN.
- “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. The post “Now THAT was a good meeting!” appeared first […]
- 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 […]
More posts from themightymo.com
My WordPress Maintenance Process
A few quick things: My WordPress Maintenance Process Demo, Part 1 Transcript: You’ll see immediately after logging in, you see the 11 updates needed as well as some messages. I’m just gonna quickly read. It looks like this. I don’t need to worry about. Are you enjoying Monster Insights? Not really <laugh>. What’s to enjoy…
How to style FacetWP checkbox hierarchy results using jQuery
I recently invested many hours trying to target and style a FacetWP taxonomy facet that uses hierarchy for display. It should be noted that you can use straight up CSS for some styling (and should use css wherever possible), but sometimes you need javascript to target parent elements and such. I thought I’d document the…
How to fix SpinupWP ballooning disk space issue
A site we host on Digital Ocean recently went down. It took me a lot of troubleshooting and digging before realizing that the issue was that our disk space was maxed out on Digital Ocean. The site in question needs ~20gb of space, so our 50gb server should be plenty. But alas, there it was…
From Toby’s Blog
- Where uncertainty exists, don’t order specific.4 Idiot Case Studies with 2 simple age-old business lessons. The post Where uncertainty exists, don’t order specific. appeared first on Toby Cryns, WordPress Trainer in Minneapolis, MN.
- “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. The post “Now THAT was a good meeting!” appeared first […]
- 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 […]