From 3a727f3ee557d6ba93d59a742625e0381ab903bc Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Wed, 10 Oct 2018 19:01:34 -0500 Subject: [PATCH 1/2] sarah laboriously added username to readme file --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 7ecdbff..63acae6 100644 --- a/README.md +++ b/README.md @@ -11,3 +11,5 @@ 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 From 13bd4dfcc5ad36e4d801af4392c454999232b885 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Wed, 10 Oct 2018 19:25:39 -0500 Subject: [PATCH 2/2] just tryna get a merge error --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 63acae6..cae59bd 100644 --- a/README.md +++ b/README.md @@ -11,5 +11,5 @@ 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