I’ve been using the default merging tool in Ubuntu 12, Meld for any conflicts that pop up in our GIT repo’s code. Now this might be common knowledge for many, then again it might be unknown to others. To navigate quickly between the differences between the two files, place yourr mouse cursor between the panel between the two files, and simply scroll with your mouse scroll button. Each scroll will fast forward Meld to the next change/conflict. This saves you tons of time when working with large files, or files with a large number of changes between them.
Great link to read up on integrating these two social network logins in your Zend application:
FYI: Twitter’s API doesn’t return the email address of the user logging in with their service, thereby effectively reducing its purpose of a third party login system. Lots of people have been bugging Twitter about this, but they won’t be changing this anytime soon.
Working on a multi-lingual project and struggling to get strftime() to return non-English date names in PHP? Your server probably doesn’t have the locales you’re looking for. Write this in a terminal:
This should return you the list of installed locales. If you don’t find yours in there, you can install it:
sudo locale-gen <locale_name>
For eg., for French you’d write:
sudo locale-gen fr_FR.utf8
Now use strftime to get the localised date:
echo strftime(” The time is: %A %B %C”);