If there is nothing in the file you should remove it (`git rm app/helpers/activities_helper.rb`).