#Merge
- git branch
- git checkout -b feature/uniform_hellos
- git status On branch feature/uniform_hellos
- git diff master feature/uniform_hellos
- git merge --abort
- gitx
#Merge
blog $ heroku create ldn-rails-blog
blog $ git remote -v
blog $ git push heroku master
blog $ heroku run rake db:migrate
ActionMailer::Base.smtp_settings = {
address: "smtp.gmail.com",
port: "587",
enable_starttls_auto: true,
authentication: :plain,
user_name: ENV["email_user_name"],
password: ENV["email_password"]