git checkout has the –ours option to check out the version of the file that you had locally (as opposed to –theirs, which is the version that you pulled in). You can pass . to git checkout to tell it to check out everything in the tree. Then you need to mark the conflicts as resolved, which you can do with git add, and commit your work once done:
creates files “bookTitleA.txt” with all the notes from that book. If relaunched, the same note is not added again if already found
In Ubuntu 11.10 Oneiric, the original Alt+F2 run a command box is disabled.
To enable it, click on your user account and select System Settings. Then choose Keyboard, at Shortcuts tab click System and you will see following picture. By default “Show the run command prompt” is disabled. Double click on it and set to Alt+F2.
How do I install the Sun Java SDK in Ubuntu 11.10 Oneric
Glue records are required when you wish to set the name servers of a domain name to a hostname under the domain name itself.
It seems like a candidate for the next db refactor of the activity stream I’m working on for bravenewtalent.com.
I didn’t know that many websites (fuorsquare, github, craiglist) were already using it
and interesting talk about unicode by richard Johnson, with a bit of history and some example of what happens when the the encoding is wrongly set. I was already aware of those problems and solutions, but good to see some other working example, history and clarifications.
To find out what version of Linux (distro) you are running, enter the following command at the shell prompt:
$ cat /etc/*-release
If you haven’t set up the Webtatic repository in yum, then add it in the command-line as following:
rpm -Uvh http://repo.webtatic.com/yum/centos/5/latest.rpm
Now install git:
yum install –enablerepo=webtatic git-all