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.
More posts from themightymo.com
Go to phpMyAdmin. Go to the “wp_options” table. Search for the field named, “active_plugins”. Edit the “active_plugins” field. Delete the value/contents of the “active_plugins” row. Save. That’s it! All your plugins are now deactivated!
Websites have multiple layers: Domain Registration When you register a domain, you pay someone ~$20/year for a .com domain. Registration means you are leasing the domain for a year or more. A domain is the “yoursite.com” or “yoururl.net” or “yourorganization.org” that people type into their browser. We use services like Namecheap, Dreamhost, and GoDaddy for…