This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
usually i don't work on local master branch | |
this time i did my mistake | |
got 4 commits ahead of origin/master | |
to fix, did this: | |
git checkout working | |
git checkout master | |
git reset --hard origin/master | |
i expected that to do the same thing as git reset --hard head^^^^ (go back 4 commits) | |
what i got was my new 'working' branch disappeared (why?) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Code changes should only be pushed to github if all tests are green. | |
Below is a common work-flow for a team working with a central repo. several variations are possible, but if unsure, please go by this: | |
1. if you are working from a Pivotal Tracker story, click "start" on that story | |
2. git pull (or, if this is your first time ever getting the code, do git clone [email protected]:our_repo/our_repo.git to get a local copy of the repo) | |
3. rake db:migrate | |
4. rake db:test:prepare | |
5. spec spec |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
one two three |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ruby-1.9.2-p0@chrislerum ~ | |
rvm list gemsets | |
rvm gemsets | |
ruby-1.8.7-p174 [ x86_64 ] | |
ruby-1.8.7-p174@global [ x86_64 ] | |
ruby-1.8.7-p174@wastedad [ x86_64 ] | |
ruby-1.8.7-p302 [ x86_64 ] | |
ruby-1.8.7-p302@carpark [ x86_64 ] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
And I am on that company's page | |
Then I should see the issues table | |
| Issue | | |
| ENVIRONMENT | | |
| Sustainability Research & Development | | |
| Conservation & Waste Management | | |
| SOCIETY | | |
| Reporting & Disclosure | | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
require 'rubygems' | |
require 'active_record' | |
require 'active_support' | |
#require_relative '/data/database.rb' | |
ActiveRecord::Base.establish_connection( | |
:adapter => "mysql", | |
:user => "root", | |
:password => "", |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ActiveRecord::Base.establish_connection( | |
:adapter => "mysql", | |
:user => "root", | |
:password => "", | |
:database => "arvest" | |
) | |
class Employee < ActiveRecord::Base | |
end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 require 'formula' | |
2 | |
3 class Vim <Formula | |
4 # Get stable versions from hg repo instead of downloading an increasing | |
5 # number of separate patches. | |
6 url 'https://vim.googlecode.com/hg/', :revision => '538cd32208' | |
7 version '7.3.011' | |
8 homepage 'http://www.vim.org/' | |
9 | |
10 head 'https://vim.googlecode.com/hg/' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ruby-1.9.2-p136 ~/code/chef-repo master | |
chef-client | |
[Tue, 08 Feb 2011 10:45:31 -0500] FATAL: Failed to read the private key /etc/chef/client.pem: #<Errno::EACCES: Permission denied - /etc/chef/client.pem>, ["/Users/chris/.rvm/gems/ruby-1.9.2-p136/gems/chef-0.9.12/lib/chef/rest/auth_credentials.rb:59:in `read'", "/Users/chris/.rvm/gems/ruby-1.9.2-p136/gems/chef-0.9.12/lib/chef/rest/auth_credentials.rb:59:in `load_signing_key'", "/Users/chris/.rvm/gems/ruby-1.9.2-p136/gems/chef-0.9.12/lib/chef/rest/auth_credentials.rb:33:in `initialize'", "/Users/chris/.rvm/gems/ruby-1.9.2-p136/gems/chef-0.9.12/lib/chef/rest.rb:48:in `new'", "/Users/chris/.rvm/gems/ruby-1.9.2-p136/gems/chef-0.9.12/lib/chef/rest.rb:48:in `initialize'", "/Users/chris/.rvm/gems/ruby-1.9.2-p136/gems/chef-0.9.12/lib/chef/client.rb:243:in `new'", "/Users/chris/.rvm/gems/ruby-1.9.2-p136/gems/chef-0.9.12/lib/chef/client.rb:243:in `register'", "/Users/chris/.rvm/gems/ruby-1.9.2-p136/gems/chef-0.9.12/lib/chef/client.rb:144:in `run'", "/Users/chris/.rvm/g |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
~/chef-repo master | |
knife bootstrap 33.333.333.33 --distro ubuntu10.04-gems | |
INFO: Bootstrapping Chef on | |
WARN: Failed to connect to 33.333.333.33 -- Net::SSH::AuthenticationFailed: [email protected] |