Skip to content

Sarah #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sgibson41 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Sarah #4

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a727f3
sarah laboriously added username to readme file
sgibson41 Oct 11, 2018
13bd4df
just tryna get a merge error
sgibson41 Oct 11, 2018
06b3f6f
Merge branch 'master' into Sarah
sgibson41 Oct 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,9 @@
3. **GIT PUSH** to push a copy of your branch and its changes to the project's repository.
***Unless you've already pushed from a branch, you'll receive an error, explaining that you have no 'upstream branch.'***
***Copy the line, "git push --set-upstream origin [your-branch-name]", then paste the command into your console and, if necessary, hit enter to set your upstream branch and push to the repo.***
sgibson41
testing 1 2 3

jcbennett3
oh my, what a big conflict.