Github - how to merge + tests

From Sandoz

You do not have permission to edit this page, for the following reasons:

• The action you have requested is limited to users in the group: Users.
• You must confirm your e-mail address before editing pages. Please set and validate your e-mail address through your user preferences.

You can view and copy the source of this page:

git ckeckout master git pull git checkout mybranch git merge master git mergetool if needed rake db:migrate git push But running the tests before is good idea. You can be sure, the branch is ok =======TESTS====== Loading the tests on mac ---------------------------------- git pull rake db:migrate rake db:test:prepare rake servers:start RAILS_ENV=test (Then bundle install ->Installing hoe (2.9.1) hoe requires RubyGems version >= 1.4. Try 'gem update --system' to update RubyGems itself then gem update --system ->ok then bundle install -> 1.8/rubygems/specification.rb:1433:in `date=': invalid date format in specification: "2010-7-15" (Gem::InvalidSpecificationException) 12/04/11 12:03 PM -> i commented the raise exception line ) rake mb:setup_schema -> music_brainz (error ->SupportVirtualPlaylistActivity) (But it returned the error : Please manually create a database called music_brainz first if you havn't already. =>no worries, make sure everything is created) rake spec autospec -fc from the rails home dir (then when you save a file or spec, it will run the affected tests) gem install growl gem install autotest autotest-growl autotest-fsevent =======check the coverage of your classes========== rake spec:rcov to check the coverage of your classes aswell

Return to Github - how to merge + tests.