Undo a Git merge that hasn’t been pushed yet

With git reflog check which commit is one prior the merge (git reflog will be a better option than git log). Then you can reset it using: There’s also another way: It will get you back 1 commit. Be aware that any modified and uncommitted/unstashed files will be reset to their unmodified state. To keep them either stash changes … Read more

List of All Locales and Their Short Codes?

The importance of locales is that your environment/os can provide formatting functionality for all installed locales even if you don’t know about them when you write your application. My Windows 7 system has 211 locales installed (listed below), so you wouldn’t likely write any custom code or translation specific to this many locales. Edit: The … Read more

What throws an IOException in Java?

Assume you were: Reading a network file and got disconnected. Reading a local file that was no longer available. Using some stream to read data and some other process closed the stream. Trying to read/write a file, but don’t have permission. Trying to write to a file, but disk space was no longer available. There … Read more

Arduino Sketch upload issue – avrdude: stk500_recv(): programmer is not responding

I had this problem with a Crowduino, running the Arduino IDE on OS X. The solution for me was to switch on verbose output during upload (in the Arduino IDE preferences pane). Then, when uploading, you can see AVRDUDE sending three packets avrdude: Send: 0 [30] [20] (with corresponding RX flashes on the board) right before the avrdude: ser_recv(): programmer is … Read more