This repository was archived by the owner on Dec 1, 2021. It is now read-only.
final pull request? #178
Open
final pull request? #178
Conversation
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
with answers
…answers Conflicts: week1/homework/questions.txt week1/homework/strings_and_rspec_spec.rb modified: ../../.gitignore new file: ../../week1/class_materials/moon_spec.rb new file: ../../week1/class_materials/resources.txt modified: ../../week1/exercises/roster.txt deleted: ../../week1/exercises/roster.txt~ modified: ../../week1/exercises/rspec_spec.rb modified: ../../week1/homework/questions.txt modified: ../../week1/homework/strings_and_rspec_spec.rb new file: ../class_materials/resources.txt new file: ../class_materials/week2.key new file: ../exercises/book.rb new file: ../exercises/book_spec.rb new file: ../exercises/mad_libs.rb new file: questions.txt new file: simon_says_spec.rb
new file: simon_says.rb
modified: questions.txt modified: simon_says_spec.rb
Conflicts: week2/homework/questions.txt week2/homework/simon_says.rb Changes to be committed: modified: questions.txt modified: simon_says.rb
modified: calculator.rb modified: calculator_spec.rb modified: questions.txt
…answers Conflicts: week2/homework/simon_says.rb week3/homework/calculator.rb week3/homework/calculator_spec.rb week3/homework/questions.txt
Conflicts: week2/homework/simon_says.rb week3/homework/calculator.rb week3/homework/calculator_spec.rb week3/homework/questions.txt
Your branch is ahead of 'origin/master' by 27 commits. Changes to be committed: modified: mid_term/mid_term_spec.rb modified: mid_term/questions.txt modified: mid_term/wish_list_spec.rb
Changes to be committed: new file: mid_term/.gitignore new file: mid_term/EvenNumber.rb new file: mid_term/README.md new file: mid_term/animal.rb new file: mid_term/dinner.rb new file: mid_term/even_number_spec.rb new file: mid_term/thanksgiving_dinner.rb new file: mid_term/turkey.rb new file: mid_term/wish_list.rb new file: test_gem/dp_test_gem.gemspec
Changes to be committed: modified: features/pirate.feature modified: features/step_definitions/tic-tac-toe-steps.rb
Changes to be committed: new file: features/step_definitions/PirateTranslator.rb new file: features/step_definitions/pirate_steps.rb
Conflicts: mid_term/even_number_spec.rb mid_term/mid_term_spec.rb mid_term/questions.txt mid_term/thanksgiving_dinner.rb mid_term/turkey.rb mid_term/wish_list.rb week2/homework/simon_says.rb week3/homework/calculator.rb week3/homework/calculator_spec.rb week3/homework/questions.txt On branch master Your branch is ahead of 'origin/master' by 29 commits. Changes to be committed: modified: README.md new file: mid_term/even_number.rb new file: week6/class_materials/resources.txt new file: week6/class_materials/test_gem/.rspec new file: week6/class_materials/test_gem/Rakefile new file: week6/class_materials/test_gem/bin/test_gem new file: week6/class_materials/test_gem/lib/test_gem.rb new file: week6/class_materials/test_gem/spec/another_spec.rb new file: week6/class_materials/test_gem/spec/test_gem_spec.rb new file: week6/class_materials/test_gem/test_gem.gemspec new file: week6/class_materials/week6.key new file: week7/class_materials/cucumber/features/converter.feature new file: week7/class_materials/cucumber/features/step_definitions/converter.rb new file: week7/class_materials/cucumber/features/step_definitions/converter_steps.rb new file: week7/class_materials/minitest/advanced_book.rb new file: week7/class_materials/minitest/book.rb new file: week7/class_materials/minitest/book_answers.rb new file: week7/class_materials/resources.txt new file: week7/class_materials/test_unit/README.rdoc new file: week7/class_materials/week7.key new file: week7/exercises/features/converter.feature new file: week7/exercises/features/puppy.feature new file: week7/exercises/features/step_definitions/converter.rb new file: week7/exercises/features/step_definitions/converter_steps.rb new file: week7/homework/features/pirate.feature new file: week7/homework/features/step_definitions/PirateTranslator.rb new file: week7/homework/features/step_definitions/pirate_steps.rb new file: week7/homework/features/step_definitions/tic-tac-toe-steps.rb new file: week7/homework/features/tic-tac-toe.feature new file: week7/homework/play_game.rb new file: week7/homework/questions.txt
Changes to be committed: modified: week7/homework/questions.txt
Changes to be committed: modified: week4/homework/questions.txt
…answers Conflicts: week7/homework/features/step_definitions/pirate_steps.rb
Changes to be committed: new file: week7/homework/features/step_definitions/pirate_steps.rb
Changes to be committed: modified: step_definitions/converter.rb
Changes to be committed: new file: step_definitions/puppy_steps.rb
Changes to be committed: new file: step_definitions/puppy.rb
Your branch is ahead of 'origin/master' by 1 commit. Changes to be committed: modified: ../../../week5/exercises/Rakefile new file: step_definitions/TicTacToe.rb modified: step_definitions/pirate_steps.rb modified: step_definitions/tic-tac-toe-steps.rb modified: tic-tac-toe.feature modified: ../play_game.rb modified: ../../../week8/exercises/couch.rb
Your branch is ahead of 'origin/master' by 2 commits. Changes to be committed: modified: step_definitions/TicTacToe.rb modified: tic-tac-toe.feature
Changes to be committed: modified: step_definitions/TicTacToe.rb modified: tic-tac-toe.feature
Your branch is ahead of 'origin/master' by 1 commit. Changes to be committed: modified: step_definitions/TicTacToe.rb
Changes to be committed: modified: step_definitions/TicTacToe.rb
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
homework updates
tic tac toe final
learned differences among git push, git pull, pull request are different