Closed coffeeisamazing closed 7 years ago
You missed something in your updates.
What do you get when you do git remote -v
?
~/wdi/projects/full-stack-project/meeting-planner-back-end (master)$ git remote -v
heroku https://git.heroku.com/obscure-chamber-16936.git (fetch)
heroku https://git.heroku.com/obscure-chamber-16936.git (push)
origin git@github.com:coffeeisamazing/meeting-planner-back-end.git (fetch)
origin git@github.com:coffeeisamazing/meeting-planner-back-end.git (push)
upstream git@github.com:ga-wdi-boston/rails-api-template.git (fetch)
upstream git@github.com:ga-wdi-boston/rails-api-template.git (push)
git diff upstream/master -- lib/tasks/test.rake
?
di/projects/full-stack-project/meeting-planner-back-end (master)$ git diff upstream/master -- lib/tasks/test.rake
diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake
index e09fc37..010aff5 100644
--- a/lib/tasks/test.rake
+++ b/lib/tasks/test.rake
@@ -1,5 +1,3 @@
# frozen_string_literal: true
-unless Rails.env.production?
- require 'rspec/core/rake_task'
- RSpec::Core::RakeTask.new(:test)
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:test)
They should not be different. That's what I was trying to get people to this morning.
You need to checkout that file from upstream.
git checkout upstream/master -- lib/tasks/test.rake
git reset HEAD lib/tasks/test.rake
rm lib/tasks/test.rake
Is this the correct sequence? Do I need to commit the deletion of the file to master?
After you run git checkout upstream/master -- lib/tasks/test.rake
what does git status
say?
If it says modified, then you want to commit the change.
~/wdi/projects/full-stack-project/meeting-planner-back-end (master)$ git checkout upstream/master -- lib/tasks/test.rake
~/wdi/projects/full-stack-project/meeting-planner-back-end (master)$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: lib/tasks/test.rake
``
Right so commit that change and you should be good to go.
All set now. To summarize, the solution was to pull the updated rake from the master template and commit to my repo.
git checkout upstream/master -- lib/tasks/test.rake
git status
git commit
Summary