Merge conflicts can be confusing, especially to those who are new with Git. You are likely to experience a merge conflict when more than one person is working on the same repository. In this post, we’re going to explore on some basic merge conflict resolution.
Continue reading “Fixing merge conflicts in Git”
Personal Diary – Simple Diary / Journal / Note app
TL;DR: Do not ever do that (or whatever that’s equivalent), unless you’re willing to face potentially serious consequences like I did. Or at least, make sure you know what you’re doing.
Sit back, and relax. It’s going to be a long read.
If you’ve seen the large number of jokes about programming online, you would know that pushing an update on a Friday, or any day before taking a few days off for that matter, is highly risky. You’re making the bold assumption that your software will function just fine as soon as it’s onto your user’s hands. If one’s lucky, users would never notice anything has changed, aside from any possible UI changes said software may have. However, we are humans, and humans make mistakes. We aren’t perfect robots being able to code a perfect piece of software every single time… well at least at the time of writing, robots can’t write software yet. Bugs will slip by, regardless of how much QA and testing you’ve done with software. If it’s a serious issue, congrats! Anger is what users go by, contacting support, writing reviews till you can’t leave your chair.
Well, as both a high school student and an indie app developer, this still applies, but in a different way. Continue reading “Pushing to Production on a Friday”
Developer: Wern Jie