From 2cfd54aace0aaa369b1f05a76cfab275ee99aed4 Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 13:54:54 +0700 Subject: [PATCH 1/7] Update and rename file_a1 to file_c1 --- file_a1 | 1 - file_c1 | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 file_a1 create mode 100644 file_c1 diff --git a/file_a1 b/file_a1 deleted file mode 100644 index 710c8eb..0000000 --- a/file_a1 +++ /dev/null @@ -1 +0,0 @@ -file_a1 diff --git a/file_c1 b/file_c1 new file mode 100644 index 0000000..e4dcf89 --- /dev/null +++ b/file_c1 @@ -0,0 +1 @@ +file_c1 From 039c2e2bac4b5b7647e0109b39e27735190ec1f9 Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 13:55:08 +0700 Subject: [PATCH 2/7] Update and rename file_a2 to file_c2 --- file_a2 | 1 - file_c2 | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 file_a2 create mode 100644 file_c2 diff --git a/file_a2 b/file_a2 deleted file mode 100644 index 8ca8c5a..0000000 --- a/file_a2 +++ /dev/null @@ -1 +0,0 @@ -file_a2 diff --git a/file_c2 b/file_c2 new file mode 100644 index 0000000..5d5f7b3 --- /dev/null +++ b/file_c2 @@ -0,0 +1 @@ +file_c2 From 848d7d3dee73035f05bd696cdd9e5f8addb388f4 Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 13:55:24 +0700 Subject: [PATCH 3/7] Update file_0 --- file_0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file_0 b/file_0 index dd18a66..e3885f3 100644 --- a/file_0 +++ b/file_0 @@ -1 +1 @@ -branch_a +branch_c From a24c51dee82a6c920088bf001135dcf2596f4ab8 Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 13:55:37 +0700 Subject: [PATCH 4/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ab921b7..48586ec 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # DevOps -lesson3_branch_a +lesson3_branch_c From 0233744d46d556178a569a957091902b54d7926d Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 13:55:46 +0700 Subject: [PATCH 5/7] Delete lesson3 directory --- lesson3/common_file | 1 - 1 file changed, 1 deletion(-) delete mode 100644 lesson3/common_file diff --git a/lesson3/common_file b/lesson3/common_file deleted file mode 100644 index 8b13789..0000000 --- a/lesson3/common_file +++ /dev/null @@ -1 +0,0 @@ - From b27a0cbbac95348f65353342c87fa47c751aafa5 Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 14:01:46 +0700 Subject: [PATCH 6/7] Create common_file --- lesson3/common_file | 1 + 1 file changed, 1 insertion(+) create mode 100644 lesson3/common_file diff --git a/lesson3/common_file b/lesson3/common_file new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/lesson3/common_file @@ -0,0 +1 @@ + From e478a69f4b98b65105785b78cf51d3543b35581f Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 14:02:23 +0700 Subject: [PATCH 7/7] Update common_file --- lesson3/common_file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lesson3/common_file b/lesson3/common_file index 8b13789..e3885f3 100644 --- a/lesson3/common_file +++ b/lesson3/common_file @@ -1 +1 @@ - +branch_c