From f1717c1f7c70cc30daeefca390364bc2aeead7d9 Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 13:57:40 +0700 Subject: [PATCH 1/9] 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 679c324cf26563e62122de95d41dede543c612d9 Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 14:00:45 +0700 Subject: [PATCH 2/9] 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 2c82147acb2ad6b9cc3355f5935c527aa3da0446 Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 14:03:05 +0700 Subject: [PATCH 3/9] 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..dd18a66 100644 --- a/lesson3/common_file +++ b/lesson3/common_file @@ -1 +1 @@ - +branch_a From 9cc3a1b52ce089176dcc7c6abf514ca623a2cbe3 Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 14:11:11 +0700 Subject: [PATCH 4/9] Branch b - a (#4) * Delete lesson3 directory * Update README.md * Update and rename file_a1 to file_b1 * Update and rename file_a2 to file_b2 * Update file_0 * Create common_file * Update common_file * 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_a1 | 1 - file_a2 | 1 - file_b1 | 1 + file_b2 | 1 + file_c1 | 1 + file_c2 | 1 + lesson3/common_file | 6 +++++- 9 files changed, 17 insertions(+), 5 deletions(-) delete mode 100644 file_a1 delete mode 100644 file_a2 create mode 100644 file_b1 create mode 100644 file_b2 create mode 100644 file_c1 create mode 100644 file_c2 diff --git a/README.md b/README.md index ab921b7..17b5298 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,6 @@ # DevOps -lesson3_branch_a +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 dd18a66..7a81033 100644 --- a/file_0 +++ b/file_0 @@ -1 +1,3 @@ -branch_a +branch_c + +branch_b \ No newline at end of file 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_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_b1 b/file_b1 new file mode 100644 index 0000000..d4879f3 --- /dev/null +++ b/file_b1 @@ -0,0 +1 @@ +file_b1 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 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 dd18a66..523506c 100644 --- a/lesson3/common_file +++ b/lesson3/common_file @@ -1 +1,5 @@ -branch_a +branch_c + +branch_b + +branch_a \ No newline at end of file From c4ce04cd634005282348c76fd310b15801f62fb8 Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 14:16:16 +0700 Subject: [PATCH 5/9] Create file_a1 --- lesson3/file_a1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 lesson3/file_a1 diff --git a/lesson3/file_a1 b/lesson3/file_a1 new file mode 100644 index 0000000..710c8eb --- /dev/null +++ b/lesson3/file_a1 @@ -0,0 +1 @@ +file_a1 From f3547c8921b7940088e8d959b536fbdf18561fd0 Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 14:16:28 +0700 Subject: [PATCH 6/9] Delete lesson3/file_a1 --- lesson3/file_a1 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 lesson3/file_a1 diff --git a/lesson3/file_a1 b/lesson3/file_a1 deleted file mode 100644 index 710c8eb..0000000 --- a/lesson3/file_a1 +++ /dev/null @@ -1 +0,0 @@ -file_a1 From dfc6f39a6a1dea3d3f3ab9e22701601ebbfd02f7 Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 14:16:40 +0700 Subject: [PATCH 7/9] Create file_a1 --- file_a1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 file_a1 diff --git a/file_a1 b/file_a1 new file mode 100644 index 0000000..710c8eb --- /dev/null +++ b/file_a1 @@ -0,0 +1 @@ +file_a1 From 26514c8bec94e9ddad51efcb6c596d9fdff3246a Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 14:16:52 +0700 Subject: [PATCH 8/9] Create file_a2 --- file_a2 | 1 + 1 file changed, 1 insertion(+) create mode 100644 file_a2 diff --git a/file_a2 b/file_a2 new file mode 100644 index 0000000..8ca8c5a --- /dev/null +++ b/file_a2 @@ -0,0 +1 @@ +file_a2 From c24e1658aa65d14023ca21ee8cc6745183e17da0 Mon Sep 17 00:00:00 2001 From: nikrobot <160483976+nikrobot@users.noreply.github.com> Date: Mon, 6 May 2024 14:17:11 +0700 Subject: [PATCH 9/9] Update file_0 --- file_0 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/file_0 b/file_0 index 7a81033..7c0f4ec 100644 --- a/file_0 +++ b/file_0 @@ -1,3 +1,5 @@ branch_c -branch_b \ No newline at end of file +branch_b + +branch_a