Tag Archives: git

Keeping locally precompiled assets out of the way on Heroku

With the Rails 3.1 Asset Pipeline, there’s the rake assets:precompile command which precompiles assets into public/assets along with a manifest.yml file which rails uses to put the paths to the assets in its templates. Precompiling generates a few files, which … Continue reading

Posted in uncategorized | Tagged , , , | 4 Comments

Partially merging a branch with git

The other day I went back to an old branch that had about five files that were changed and I only wanted to incorporate two of them into my master branch. In order to just merge in a couple, I … Continue reading

Posted in uncategorized | Tagged , , | Comments Off