So this happened just now with a colleague. He’s been working for few months now. My way of handling merge conflict: Open WinMerge to diff See the conflicting part Correct the conflicting part by copying the changes to the destination file in WinMerge His way Open WinMerge to diff See the conflicting part Opens the source file in Windows notepad Copies the entire contents to clipboard Opens a new tab in Notepad++ </div> Pastes the contents Goes to the line to be corrected.
With the next Barcamp Bangalore looming round the corner, I’d pitched in to help with some of the website tasks. I installed the traditional WAMP stack with WAMP Server for Windows and started working with WordPress. Needed to get the email notifications working, saw that it wasn’t. Bit of research & found that I’d need a SMTP server or an equivalent of sendmail. All the cool kids seem to be using Fake sendmail - I tried it to use with Gmail’s SMTP servers which uses authentication & TLS.
Mini review/recommendation I’d written about Game Dev Tycoon on Steam: You start off as a single game dev operating out of your garage, and then slowly expand as you move to bigger office, hire more people and just grow. The game starts off in the distant past, and contains homages to major consoles & other gaming device, albeit with similar names, no doubt to avoid legal wrangles. Gameplay wise, this game will have you hooked.
<td style="padding-top: 6px;" width="100%"> <strong><br /> sathyabhat<br /> <a href="https://sathyabhat.newsblur.com/story/the-keys-to-oracle/d37bc7">shared this story</a><br /> from <img style="vertical-align: middle; width: 16px; height: 16px;" src="https://icons.newsblur.com/8079.png" alt="" /> The Tom Kyte Blog:</strong> </td> "What do I have to do to become expert, where is the list of key things I need to do with regards to Oracle" This is a question I get on asktom frequently – what are the things I need to know, what do I have to do to become expert, where is the list of key things I need to do with regards to Oracle.
Long ago when Backupify said they were going to offer their service for free, I knew it was too good to be true and weren’t going to last long. Fast forward today, they mention they’re going to not only kill their free twitter backup service, but also wipe out data of their existing free users. Dear Customer, We are writing to let you know that we are discontinuing the current TweetBackup service.
<td width="100%" style="padding-top: 6px;"> <b><br /> sathyabhat<br /> <a href="https://sathyabhat.newsblur.com/story/errord-where-i-come-/91001f">shared this story</a><br /> from <img src="https://icons.newsblur.com/941.png" style="vertical-align: middle;width:16px;height:16px;" /> The Daily WTF:</b> </td> "In my native language, we don't have translations for seven months out of the year. Way to go Windows Live!!" <p> LOL. </td> </tr> </table> <hr style="clear: both; margin: 0 0 24px;" /> <p> "Someone FINALLY got it right!!" <strong>Farz</strong> wrote, "In my native language, we don't have translations for seven months out of the year.
What happens when pirates play a game development simulator and then go bankrupt because of piracy? → Summary of "What happens when pirates play a game development simulator and then go bankrupt because of piracy?" When Game Dev Tycoon (a Game Development Simulation Game) was released, its developer released a cracked version on BitTorrent simultaneously. After a certain point in the game, the cracked version would prevent the player from generating simulated revenue due to simulated piracy.
This morning in my half-woken state, as I was checking Hacker News, I spotted this piece about Alienware launching the X51 with Ubuntu. I initially thought I was dreaming, and woke up immediately and read the piece, and I was left dumbfounded when I read it again to be sure. Kind of dumbfounded at Dell launching an Alienware X51 with Ubuntu https://alienware.com/ubuntu/ Not sure what’s Dell thinking - there aren’t any great native AAA games available, can’t imagine this would make studios to make Linux ports either
Couple of months ago, just about a month before #cpgweds - the engagement my Envy 14 laptop started showing signs of dying - weird noises coming from the vents, system freezing arbitrarily, system getting incredibly hot - and that’s really unusual because the Envy’s cooling system is probably one of the best that I’ve seen in a laptop. Soon enough, it became clear that a fan was not working - my idle temperatures hit 85 degrees C, and start any game or even xbmc, and the temperatures would hit 95-100 and shutdown sooner or later.