From 314363cf99eff74c619edafaba617b6e7de69455 Mon Sep 17 00:00:00 2001 From: Elliot Oram Date: Mon, 14 Mar 2022 11:33:19 +0000 Subject: [PATCH] Add a merge conflict --- docs/add_commit.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/add_commit.md b/docs/add_commit.md index f09f16d..0d9a1ed 100644 --- a/docs/add_commit.md +++ b/docs/add_commit.md @@ -12,5 +12,5 @@ git commit -m "My hello world" # This will tell git that we want to package all # The origin doesn't know about your branch or your code at this point so we have to tell it where to put our branch when we push it. # The --set-upstream part of the command say push our branch to the origin with the branch name git push --set-upstream origin -# Now the link between the local repository and origin has been made, subsequent pushes can be done with just git push. -``` \ No newline at end of file +# Now the link between the local repository and origin has been made (my edit), subsequent pushes can be done with just git push. +```