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”
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.
Yay! Since this website is using HTTPS, all communication with this website is now encrypted. You can now browse this website safely. When a website is using HTTPS, it means that the connection between your device and that site is private and encrypted, therefore people around you (e.g., those on the same WiFi network, or if you are using an unprotected WiFi network) won’t be able to easily intercept and tamper with what you do on the site.
Hence, your email and user data, if submitted via feedback forms or comment sections on this site, cannot be intercepted by anybody. They might notice that you’re browsing “wernjie.com”, but other than that, they cannot read the traffic between your computer and this site, and thus they will not be able to seize your user data or determine which post are you reading here.
Furthermore, you won’t get that annoying “Not Secure” notification on the url/search bar any longer while visiting this website, which is displayed on most major browsers when going to an http-only site.
Note that if you are on a compromised WiFi network, security benefits of HTTPS may not help.
Hey there! Here’s a cool robot I’ve just developed.
Smart Rero Cleaner is the most intelligent cleaning robot ever! With just two taps¹, you are able to fully clean a room in no time, no work needed! And no, this is not some kind of joke robot that bangs everywhere mindlessly, it can actually “see” and remember how your room looks like! Because of that, it even knows exactly where it is in your house at any given time, and never misses a spot to clean! And it even returns to its original location after cleaning! Cool, eh?
Please like & share to support this project (using either social media platforms, clicking on the like & share button on respective videos), thanks! (psst, its for a competition)
So, I recently found that there is an article on Wikipedia that lists unusual articles on the site itself. This refers to content that usually isn’t found on a standard encyclopaedia, such as whole articles dedicated to 0.999… or the fact that people named Abcde exists. Take a look!
Voice Controlled OmniDirectional Wheelchair, as the name suggests, it is possibly the first wheelchair to be able to move in an infinite amount of directions and controlled using voice commands. It is built with Rero and Lego, along with a mobile phone for transcribing your voice to beeps, which the robot’s brain (Rero Controller) can understand.