From 9f21aeff9aef6f9d8ed0a38dc5029850050b8e59 Mon Sep 17 00:00:00 2001 From: Marina Date: Sat, 24 May 2025 11:30:27 +0200 Subject: [PATCH 1/8] Updated README.md with test content --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 05d1576..13772fd 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,6 @@ This is a playground for the lab from the Git Branching and Pull Requests lesson from the Software Engineering and DevOps Course at SoftUni. ## Make your changes here + +### My name is Marina +This is a test update for Git Lab. From bfd5a2d8bafdfc162c0124de76ed1839d4ca128d Mon Sep 17 00:00:00 2001 From: Marina Date: Sat, 24 May 2025 11:49:09 +0200 Subject: [PATCH 2/8] Conflicting change in demo.txt --- demo.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 demo.txt diff --git a/demo.txt b/demo.txt new file mode 100644 index 0000000..b7cc0b4 --- /dev/null +++ b/demo.txt @@ -0,0 +1 @@ +This is a conflicting change \ No newline at end of file From 211a0118d43d1d6c53dad8a5bb0f118f9551c64f Mon Sep 17 00:00:00 2001 From: Marina Date: Sat, 24 May 2025 11:51:46 +0200 Subject: [PATCH 3/8] Edit demo.txt in main for conflict --- demo.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo.txt b/demo.txt index b7cc0b4..9a35d14 100644 --- a/demo.txt +++ b/demo.txt @@ -1 +1 @@ -This is a conflicting change \ No newline at end of file +This is a different change in main \ No newline at end of file From 056665663fdc0d74bdbe2ccc01f582aaf964d170 Mon Sep 17 00:00:00 2001 From: Marina Date: Sat, 24 May 2025 11:55:55 +0200 Subject: [PATCH 4/8] Edit demo.txt in main to simulate conflict --- demo.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/demo.txt b/demo.txt index 9a35d14..a637ab0 100644 --- a/demo.txt +++ b/demo.txt @@ -1 +1,2 @@ -This is a different change in main \ No newline at end of file +This is a different change in main +This is a conflicting change from conflict-v2 \ No newline at end of file From f9de5a02ed477b60b1682ffd8fc1a5d92bfaad86 Mon Sep 17 00:00:00 2001 From: Marina Date: Sat, 24 May 2025 11:57:21 +0200 Subject: [PATCH 5/8] Conflicting edit in demo.txt --- demo.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/demo.txt b/demo.txt index a637ab0..338ebfc 100644 --- a/demo.txt +++ b/demo.txt @@ -1,2 +1 @@ -This is a different change in main This is a conflicting change from conflict-v2 \ No newline at end of file From 307858127f270fae38f5d678c0488dcdebf26dbd Mon Sep 17 00:00:00 2001 From: Marina Date: Sat, 24 May 2025 12:02:00 +0200 Subject: [PATCH 6/8] Add line from main --- demo.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo.txt b/demo.txt index 338ebfc..aebf945 100644 --- a/demo.txt +++ b/demo.txt @@ -1 +1 @@ -This is a conflicting change from conflict-v2 \ No newline at end of file +Line from main From 63a8eb6a04719d66fa4ae69d669788f235543477 Mon Sep 17 00:00:00 2001 From: Marina Date: Sat, 24 May 2025 12:03:04 +0200 Subject: [PATCH 7/8] Add conflicting line in force-conflict --- demo.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo.txt b/demo.txt index 338ebfc..a41ae76 100644 --- a/demo.txt +++ b/demo.txt @@ -1 +1 @@ -This is a conflicting change from conflict-v2 \ No newline at end of file +Conflicting line from force-conflict \ No newline at end of file From 6e94d891035d89c16e106a61e3ead4682446feef Mon Sep 17 00:00:00 2001 From: Marina Date: Sat, 24 May 2025 12:09:02 +0200 Subject: [PATCH 8/8] Add form to index.html --- index.html | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 index.html diff --git a/index.html b/index.html new file mode 100644 index 0000000..d4d2b88 --- /dev/null +++ b/index.html @@ -0,0 +1,19 @@ + + + + Form Example + + +

Hello from Marina

+ +
+
+
+
+

+ +
+ + + + \ No newline at end of file