From 01be5e1b857bfaf7781a34c17d738a7c211a0ecb Mon Sep 17 00:00:00 2001 From: stephanie-warmenhoven Date: Sat, 5 Jun 2021 09:44:01 -0700 Subject: [PATCH 1/3] steph --- steph.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 steph.md diff --git a/steph.md b/steph.md new file mode 100644 index 0000000..7ca5204 --- /dev/null +++ b/steph.md @@ -0,0 +1 @@ +Hello, I'm Steph. \ No newline at end of file From af4854845a5fd2914fcad6f74a9c0599046a8e0a Mon Sep 17 00:00:00 2001 From: stephanie-warmenhoven Date: Sat, 5 Jun 2021 11:37:45 -0700 Subject: [PATCH 2/3] Trying to make a conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7a6ef96..35ed599 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ A branch is a series of commits We can create a new branch using `git branch ""` The new branch's root commit will be master commit of the branch you've "branched off of" -# To fetch and pull +# fetch vs pull git fetch -> getting all the commits from remote (github) From edf0971222e3bd769631a2a766ab96998066476c Mon Sep 17 00:00:00 2001 From: stephanie-warmenhoven Date: Sat, 5 Jun 2021 11:43:57 -0700 Subject: [PATCH 3/3] Deleted some things --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 35ed599..d6a29fd 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,10 @@ #git branching and merging practise -A branch is a series of commits - We can create a new branch using `git branch ""` The new branch's root commit will be master commit of the branch you've "branched off of" -# fetch vs pull +# To fetch vs pull git fetch -> getting all the commits from remote (github)