From 7a67b04b1853e1abeb476561bbe6271eb9d56315 Mon Sep 17 00:00:00 2001 From: Emma Vonbuelow Date: Sun, 18 Feb 2024 11:16:34 -0500 Subject: [PATCH 1/2] My first HBP commit! --- git_is_amazing.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git_is_amazing.html b/git_is_amazing.html index 4dcc7dd..b881708 100644 --- a/git_is_amazing.html +++ b/git_is_amazing.html @@ -50,12 +50,12 @@

2. Now let's branch out!

3. Let's make a change!

- Add your name to the list below:

Ensure you pull the latest changes from the main branch before adding your name to minimize merge conflicts.

- git pull origin main + git pull origin maingit

- Now add your change to git

git add . or git add <file_path>

- Now what's a commit and how do I commit my change?

From 6e4d4b373c2e7c1fda7090e67966910a20d43ff2 Mon Sep 17 00:00:00 2001 From: Emma Vonbuelow Date: Sun, 18 Feb 2024 11:28:26 -0500 Subject: [PATCH 2/2] My second HBP commit! --- git_is_amazing.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git_is_amazing.html b/git_is_amazing.html index b881708..05a5ddd 100644 --- a/git_is_amazing.html +++ b/git_is_amazing.html @@ -55,7 +55,7 @@

3. Let's make a change!

  • Hi, I am <Your Name>, I am an explorer at hackbeanpot 2024!!
  • Ensure you pull the latest changes from the main branch before adding your name to minimize merge conflicts.

    - git pull origin maingit + git pull origin main

    - Now add your change to git

    git add . or git add <file_path>

    - Now what's a commit and how do I commit my change?