Hannah@Hannah-PC MINGW64 ~/Documents/Github/dice-game (product-backlog)
$ git commit -a -m "Minor Product Backlog changes"
On branch product-backlog
Untracked files:
cli/build/
cli/src/main/java/Main.class
doc/Product Backlog.pdf
shared/build/
nothing added to commit but untracked files present
git status
Hannah@Hannah-PC MINGW64 ~/Documents/Github/dice-game (product-backlog)
$ git commit --amend
[product-backlog 60a50d5] Replaced product backlog with correct format
Date: Fri Apr 8 19:49:01 2016 -0700
warning: LF will be replaced by CRLF in cli/build/install/cli/bin/cli.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in cli/build/scripts/cli.
The file will have its original line endings in your working directory.
22 files changed, 504 insertions(+), 20 deletions(-)
create mode 100644 cli/build/classes/main/Main.class
create mode 100644 cli/build/install/cli/bin/cli
create mode 100644 cli/build/install/cli/bin/cli.bat
create mode 100644 cli/build/install/cli/lib/cli.jar
create mode 100644 cli/build/install/cli/lib/commons-lang3-3.3.2.jar
create mode 100644 cli/build/install/cli/lib/opencsv-3.7.jar
create mode 100644 cli/build/install/cli/lib/shared.jar
create mode 100644 cli/build/libs/cli.jar
create mode 100644 cli/build/scripts/cli
create mode 100644 cli/build/scripts/cli.bat
create mode 100644 cli/build/tmp/jar/MANIFEST.MF
create mode 100644 cli/src/main/java/Main.class
delete mode 100644 doc/Product Backlog.md
create mode 100644 doc/Product Backlog.pdf
create mode 100644 shared/build/classes/main/Driver.class
create mode 100644 shared/build/classes/main/dice/DiceGame.class
create mode 100644 shared/build/classes/main/dice/Die.class
create mode 100644 shared/build/classes/main/dice/RollAfterGameOverException.class
create mode 100644 shared/build/classes/main/dice/RollRecord.class
create mode 100644 shared/build/classes/main/dice/StatsProcessor.class
create mode 100644 shared/build/libs/shared.jar
create mode 100644 shared/build/tmp/jar/MANIFEST.MF
Hannah@Hannah-PC MINGW64 ~/Documents/Github/dice-game (product-backlog)
$ git status
On branch product-backlog
Untracked files:
(use "git add <file>..." to include in what will be committed)
doc/Product Backlog.pdf
nothing added to commit but untracked files present (use "git add" to track)
doc
directory? Good to show them you were involved with the design of the CLI
./gradlew check
locally to run everything Travis does so you have a better idea if it'll break when you push
git clone https://github.com/anderspitman/dice-game
git checkout -b add-cli-pseudocode
add-cli-pseudocode
and change into that branch
cli_pseudocode.txt
(or whatever you want to call it) in the doc
directory
git add doc/FILENAME.txt
git commit -m "Useful message about what you added"
git config --global user.name sarahka7
git config --global user.email <your-email-address>
dice-game
doc
it would just be git add cli_pseudocode.txt
ls
ls doc
git push origin add-cli-pseudocode
, or whatever you named the branch
git remote rename origin upstream
git remote add origin https://github.com/sarahka7/dice-game
We really only have 2 problems:
1) your PR is breaking the build
2) you commited some files that shouldn't be in git
If you create a new PR with you code in a completely separate directly (like your original PR I believe) and only commit the text files we should be good. We can sort out the details later
git push origin BRANCH_NAME
again
git remote rm origin
git remote add origin https://github.com/sarahka7/dice-game
git branch
git push origin add-cli-psuedocode
git checkout master
git pull upstream master
git log
you should see your commit towards the top