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