Git: prevent creation of .orig files after mergetool
To avoid the creation of .orig files during git mergetool:
git config --global mergetool.keepBackup false
To avoid the creation of .orig files during git mergetool:
git config --global mergetool.keepBackup false
when trying to run this:
sudo apt-get update
on Vagrant with Ubuntu, I kept getting the following error:
Temporary failure resolving 'us.archive.ubuntu.com
The solution was to add sensible DNS entries in:
/etc/resolv.conf
This is the config for Google's DNS servers:
nameserver 8.8.8.8 nameserver 8.8.4.4
I was getting a never-ending parade of these warnings launching Rails and just about everything else:
/psych.bundle: warning: already initialized constant ANY
The solution is to install the latest psych gem system-wide, that is, outside of any gemsets you may have. You probably want to also make sure you don't have any old versions of psych.
gem use 1.9.3
gem uninstall psych
gem install psych
When generating scaffolded specs for controllers recently, they were failing in odd ways, despite following the instructions here.
It turns out that the solution is to remove the valid_session parameters from the various action calls, e.g. this:
get :index, {}, valid_session
