One of the first real points of frustration a developer encounters with Git is the initial unresolved merge conflict. Beyond Compare is an excellent file comparison utility and can be configured with Git as a merge and diff tool.
To setup diff on Linux, create a short wrapper script to pass the parameters in the correct order:
vi ~/git-diff-wrapper
#!/bin/sh
# diff is called by git with 7 parameters:
# path old-file old-hex old-mode new-file new-hex new-mode
You'll notice that there is no link tag specifying the rss location in the source of a Facebook page. RSS links are however availble using the page ID of the content.
To obtain the page ID, right click on the like icon and copy the link.
Configuring a box for Drupal development, testing server configurations and PHP debugging.
There are a number of ways to setup Drupal on you development box. Below are a list of the steps I use when creating a new project. If you're doing professional work in Drupal, you'll probably be developing for multiple websites. This configuration will allow for multiple sites, Drupal and otherwise. I'll also outline setting up Eclipse, xdebug and various server utilities you may need for testing configurations in your dev environment.
