From e7509532561c77eafbca3faf7c17b046577f3e37 Mon Sep 17 00:00:00 2001 From: oleksandr-jr Date: Wed, 2 Jul 2025 18:34:37 +0200 Subject: [PATCH 1/7] Commit 1 --- src/main/resources/test-1.txt | 1 + src/main/resources/test-2.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 src/main/resources/test-1.txt create mode 100644 src/main/resources/test-2.txt diff --git a/src/main/resources/test-1.txt b/src/main/resources/test-1.txt new file mode 100644 index 0000000..5ab2f8a --- /dev/null +++ b/src/main/resources/test-1.txt @@ -0,0 +1 @@ +Hello \ No newline at end of file diff --git a/src/main/resources/test-2.txt b/src/main/resources/test-2.txt new file mode 100644 index 0000000..beef906 --- /dev/null +++ b/src/main/resources/test-2.txt @@ -0,0 +1 @@ +World \ No newline at end of file From a138c632cf434102f026be1e46b25fe45f79ab97 Mon Sep 17 00:00:00 2001 From: oleksandr-jr Date: Wed, 2 Jul 2025 18:35:41 +0200 Subject: [PATCH 2/7] Commit 2 --- src/main/resources/test-2.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/resources/test-2.txt b/src/main/resources/test-2.txt index beef906..214b35f 100644 --- a/src/main/resources/test-2.txt +++ b/src/main/resources/test-2.txt @@ -1 +1,4 @@ -World \ No newline at end of file +World + + +UPD 1 \ No newline at end of file From 70900ba3c149b2c5ba7ca33d295ecce12cf62999 Mon Sep 17 00:00:00 2001 From: oleksandr-jr Date: Wed, 2 Jul 2025 18:35:51 +0200 Subject: [PATCH 3/7] Commit 3 --- src/main/resources/test-2.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/resources/test-2.txt b/src/main/resources/test-2.txt index 214b35f..e40273c 100644 --- a/src/main/resources/test-2.txt +++ b/src/main/resources/test-2.txt @@ -1,4 +1,7 @@ World -UPD 1 \ No newline at end of file +UPD 1 + + +UPD 2 From bb8a3adbd120a419fb70e8c30069b3892ce71513 Mon Sep 17 00:00:00 2001 From: oleksandr-jr Date: Wed, 2 Jul 2025 18:36:05 +0200 Subject: [PATCH 4/7] Commit 4 --- src/main/resources/test-1.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/resources/test-1.txt b/src/main/resources/test-1.txt index 5ab2f8a..6f3c584 100644 --- a/src/main/resources/test-1.txt +++ b/src/main/resources/test-1.txt @@ -1 +1,4 @@ -Hello \ No newline at end of file +Hello + + +UPD 3 \ No newline at end of file From 9093fc3d9fc1995d0c56015452b75dcd42b30ce8 Mon Sep 17 00:00:00 2001 From: oleksandr-jr Date: Wed, 2 Jul 2025 18:36:52 +0200 Subject: [PATCH 5/7] Commit 5 --- src/main/resources/test-2.txt | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 src/main/resources/test-2.txt diff --git a/src/main/resources/test-2.txt b/src/main/resources/test-2.txt deleted file mode 100644 index e40273c..0000000 --- a/src/main/resources/test-2.txt +++ /dev/null @@ -1,7 +0,0 @@ -World - - -UPD 1 - - -UPD 2 From 7122eb11d66a648a9b89e0f3ef471710a5d4a888 Mon Sep 17 00:00:00 2001 From: oleksandr-jr Date: Wed, 2 Jul 2025 18:45:33 +0200 Subject: [PATCH 6/7] Revert test-2.txt initial state --- src/main/resources/test-2.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/main/resources/test-2.txt diff --git a/src/main/resources/test-2.txt b/src/main/resources/test-2.txt new file mode 100644 index 0000000..beef906 --- /dev/null +++ b/src/main/resources/test-2.txt @@ -0,0 +1 @@ +World \ No newline at end of file From bf870c89099e7d658e1905d3e82bdfb8be71d280 Mon Sep 17 00:00:00 2001 From: oleksandr-jr Date: Wed, 2 Jul 2025 18:47:10 +0200 Subject: [PATCH 7/7] Cherry pick --- src/main/resources/test-2.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/resources/test-2.txt b/src/main/resources/test-2.txt index beef906..5e387b9 100644 --- a/src/main/resources/test-2.txt +++ b/src/main/resources/test-2.txt @@ -1 +1,5 @@ -World \ No newline at end of file +World + + + +UPD 2