Skip to content

Manderson #3

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
marydanderson wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Manderson #3

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1603fdf
mary anderson user account added
Oct 11, 2018
43b60ac
message I ADDED SOMETHING
Oct 11, 2018
8ef6327
Merge branch 'master' into manderson
marydanderson 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
15 changes: 12 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,19 @@
2. Open your local README again. This time, add your Github username to the bottom of the file.
3. Save your changes.
# Exercise 3 - PUSHING TO THE REMOTE REPO
1. **GIT ADD -A** to stage your changes.
1. **GIT ADD -A** to stage your changes. #prepping it to commit
2. **GIT COMMIT -M [brief message about your commit]** to commit those changes to your branch.
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.***
jcbennett3
oh my, what a big conflict.
manderson
Jeff Gipson
RANDOM TEXT jeffgipson
This is a conflict!
My, what a huge conflict.
master

git username: marydanderson