From 1603fdf1729b5eafee200e8d9f0ee65a8d529a5e Mon Sep 17 00:00:00 2001 From: marydanderson Date: Wed, 10 Oct 2018 20:03:56 -0500 Subject: [PATCH 1/2] mary anderson user account added --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 05483fa..1d2bb09 100644 --- a/README.md +++ b/README.md @@ -16,3 +16,5 @@ Jeff Gipson This is a conflict! My, what a huge conflict. master + +git username: marydanderson From 43b60ace164cb5ca068192aa178845bd43af02da Mon Sep 17 00:00:00 2001 From: marydanderson Date: Wed, 10 Oct 2018 20:22:39 -0500 Subject: [PATCH 2/2] message I ADDED SOMETHING --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1d2bb09..1902fd3 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,13 @@ 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.*** Jeff Gipson - jeffgipson + RANDOM TEXT jeffgipson This is a conflict! My, what a huge conflict. master