From 969051cfb664570d6bcefac86517e6a9437a2078 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 6 Feb 2025 08:50:50 -0500 Subject: [PATCH 1/2] initial commit --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index eb74a20..d7d4723 100644 --- a/README.md +++ b/README.md @@ -12,3 +12,6 @@ This section is dedicated to testing how to resolve conflicts in Git. Conflicts - Add more changes from upstream By practicing conflict resolution, you can ensure smooth collaboration in your projects. + + +I made a couple of changes to test the commit functions \ No newline at end of file From f849b565455b3440b2621017e56434827118c47e Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 11 Feb 2025 08:15:05 -0500 Subject: [PATCH 2/2] I made even more changes --- README.md | 4 +++- script.ps1 | 0 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 script.ps1 diff --git a/README.md b/README.md index d7d4723..d649247 100644 --- a/README.md +++ b/README.md @@ -14,4 +14,6 @@ This section is dedicated to testing how to resolve conflicts in Git. Conflicts By practicing conflict resolution, you can ensure smooth collaboration in your projects. -I made a couple of changes to test the commit functions \ No newline at end of file +I made a couple of changes to test the commit functions. + +I made even more changes to the file. \ No newline at end of file diff --git a/script.ps1 b/script.ps1 new file mode 100644 index 0000000..e69de29