From 473d72085be26d6abb67ba8b94d87a2faabac562 Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 13:56:07 +0700 Subject: [PATCH 1/8] 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 db73fa9976d05f92d0d54e2d50fcb4a73a6c19fd Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 13:56:25 +0700 Subject: [PATCH 2/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ab921b7..c43b139 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # DevOps -lesson3_branch_a +lesson3_branch_b From 5995056dc746786f5cac02b2f417bc3716fca1c1 Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 13:56:41 +0700 Subject: [PATCH 3/8] Update and rename file_a1 to file_b1 --- file_a1 | 1 - file_b1 | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 file_a1 create mode 100644 file_b1 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_b1 b/file_b1 new file mode 100644 index 0000000..d4879f3 --- /dev/null +++ b/file_b1 @@ -0,0 +1 @@ +file_b1 From cf209a4facbe6dd2683f89208c03ccf84bc595ff Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 13:56:58 +0700 Subject: [PATCH 4/8] Update and rename file_a2 to file_b2 --- file_a2 | 1 - file_b2 | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 file_a2 create mode 100644 file_b2 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_b2 b/file_b2 new file mode 100644 index 0000000..aefe24a --- /dev/null +++ b/file_b2 @@ -0,0 +1 @@ +file_b2 From e32c690d576776c0842168ffb9f487c3462b1690 Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 13:57:12 +0700 Subject: [PATCH 5/8] Update file_0 --- file_0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file_0 b/file_0 index dd18a66..d091332 100644 --- a/file_0 +++ b/file_0 @@ -1 +1 @@ -branch_a +branch_b From 90a72d1a61469bc5ce9371f51e70c82f6387a356 Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 14:01:26 +0700 Subject: [PATCH 6/8] 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 49d843f89dbe15ecea2e35be11c96fee4c70a785 Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 14:02:45 +0700 Subject: [PATCH 7/8] 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..d091332 100644 --- a/lesson3/common_file +++ b/lesson3/common_file @@ -1 +1 @@ - +branch_b From 396969460ef4ad958b741d1a9798270ff2f7ae26 Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 14:10:49 +0700 Subject: [PATCH 8/8] Branch c - b (#3) * Update and rename file_a1 to file_c1 * Update and rename file_a2 to file_c2 * Update file_0 * Update README.md * Delete lesson3 directory * Create common_file * Update common_file --- README.md | 6 +++++- file_0 | 4 +++- file_c1 | 1 + file_c2 | 1 + lesson3/common_file | 2 ++ 5 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 file_c1 create mode 100644 file_c2 diff --git a/README.md b/README.md index c43b139..17b5298 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,6 @@ # DevOps -lesson3_branch_b +branch_c +lesson3_branch_c + +branch_b +lesson3_branch_b \ No newline at end of file diff --git a/file_0 b/file_0 index d091332..7a81033 100644 --- a/file_0 +++ b/file_0 @@ -1 +1,3 @@ -branch_b +branch_c + +branch_b \ No newline at end of file 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 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 diff --git a/lesson3/common_file b/lesson3/common_file index 54149f0..523506c 100644 --- a/lesson3/common_file +++ b/lesson3/common_file @@ -1,3 +1,5 @@ +branch_c + branch_b branch_a \ No newline at end of file