From 75ee9f6907210b2d2051fb092d814dbc4c4c7985 Mon Sep 17 00:00:00 2001 From: James Akinola Date: Thu, 12 Oct 2023 16:58:22 +0100 Subject: [PATCH 1/2] Fixed name and email bugs in 'mine.py' --- mine.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mine.py b/mine.py index cee063b..042cc48 100644 --- a/mine.py +++ b/mine.py @@ -1,6 +1,6 @@ # Define variables -name = "PUT YOUR NAME" -email = 'PUT YOUR EMAIL' +name = "JAMES AKINOLA" +email = 'BROAKIN@GMAIL.COM' # Print the name and email address print("Name:", name) From 2eec0dbb8afb101eeaf95ac4e4ad11e4b62dad80 Mon Sep 17 00:00:00 2001 From: James Akinola Date: Thu, 12 Oct 2023 17:28:19 +0100 Subject: [PATCH 2/2] Updated README with merge sync fix details --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 813b6e3..e63c0bd 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ -# Git-Github \ No newline at end of file +# Git-Github +Outcome from the merge of the branch to the main branch indicates that the branch was ahead of "origin/main" by 1 commit. +This was resolved by initiating a push of the local commit to the remote repo. After this, the branch and origin/main became up to date. \ No newline at end of file