...state. You may want to modify this. Store the attached deploy.rake in lib/capistrano/tasks/, or merge the tasks with an existing deploy.rake file in that location. Hook up the Rake tasks...

If you want to make your Rails application be capable of sending SMTP emails, check out the action mailer configuration...

...go to the list of users # goes to users_path Cry no more. Just merge the following code into your features/support/paths.rb and module NavigationHelpers def path_to(page_name)

def self.to_sql(options) options = { :units => :miles, :latitude_column => 'latitude', :longitude_column => 'longitude' }.merge(options) %{ (ACOS( GREATEST(-1, LEAST(1, SIN(RADIANS(#{options[:latitude]})) * SIN(RADIANS(#{options[:latitude_column...

...you might already have code hooked up to before(:all) and after(:all), so merge it together: Spec::Runner.configure do |config| config.before(:all) do DeferredGarbageCollection.start end config.after(:all) do DeferredGarbageCollection.reconsider...

This is more tricky than it should be because url_for, asset_path, etc. all rely on different mechanisms.

...changes. Any time spent on that is well invested as it saves you rejected merge requests or any mess you need to clean up later. While you can just use...

...that importing a table overwrites an existing table. There won't be a magic merge...

...it to production with this deploy. Ask if you want to proceed. If yes, merge the master into the production branch, push and deploy with bundle exec cap production deploy...

This works well in the simplified case, when your link disappears after it was clicked. Let link_to_remote behave...

makandra dev

...onto your HEAD. Most often you can achieve the same result with a rebase & merge. Example: master commit1 - commit3 feature-branch \ commit2 - commit4 git checkout feature-branch git reset --hard...

...by argument-less git-pull(1) and other commands. For more information, see branch..merge in git-config...

kernel.org

...generated message: $ git stash Saved working directory and index state WIP on master: 77af0df Merge branch 'production' While this is okay to temporarily stash away stuff, you may want a...

You can tell git to ignore different kinds and amounts of whitespace when merging or cherry-picking. This often occurs when you changed indentation, or converted tabs to spaces.

git merge -Xignore-space-change or git cherry-pick -Xignore-space-change

makandra dev
github.com

...e.g. geordi dep will run the deploy command. geordi deploy Guided deployment, including push, merge, switch branches. Does nothing without confirmation. geordi capistrano Run something for all Capistrano environments, e.g...

linux.die.net

...This tool is especially useful when you have a ton of commits after a merge and want to know the commit differences between branches...

gitready.com

...on a remote repository so you can pull them down and check them out, merge them into your local branches, etc. You can see the remote branches by saying

makandra dev
github.com

...shell, etc.) needs to be aware of Exception#cause. Nesty on the other hand-merges the stack trace array of the current and previous exception. This way Nesty does not...

Master mode (Rails 2) Put the attached file into your spec directory, then merge these lines into your spec_helper.rb: require 'spec/constants_helper' Spec::Runner.configure do |config| # ... config.include ConstantsHelper config.after(:each...