This is a note about how to merge the diverged changes from an upstream branch(such as “master”) to your working branch(such as “f1”).
How to merge upstream changes in Git
Make Mysql not run after boot
Some Java concurrent programming hints
Disable overlay scrollbar of Ubuntu Unity with dconf-editor
Refer here.
How to enable Java in Firefox for Webex under Ubuntu
Refer here.
Some Groovy hints I learned
Solarized Colorscheme for Vim
“Solarized” is the color scheme used by Octopress. You can also set it as your Vim color scheme.
Convert markdown to PDF using Node.js
Solution one is markdown-pdf.