diff --git a/Testing if I can Upload in the repository of Johannes b/Testing if I can Upload in the repository of Johannes new file mode 100644 index 0000000..7d69029 --- /dev/null +++ b/Testing if I can Upload in the repository of Johannes @@ -0,0 +1,6 @@ +Testing further +Try to write at Johannes repository +next try +Now create a branch in Johannes repository and call it leaf +with changing into leaf branch +I have no permission to add it to the repository of Johannes \ No newline at end of file diff --git a/further remote test b/further remote test new file mode 100644 index 0000000..4d54800 --- /dev/null +++ b/further remote test @@ -0,0 +1 @@ +Testing with remote and branch \ No newline at end of file diff --git a/leaf1.txt b/leaf1.txt new file mode 100644 index 0000000..570a4cc --- /dev/null +++ b/leaf1.txt @@ -0,0 +1 @@ +leaf1 diff --git a/leaf2.txt b/leaf2.txt new file mode 100644 index 0000000..848cb27 --- /dev/null +++ b/leaf2.txt @@ -0,0 +1 @@ +leaf2 \ No newline at end of file diff --git a/leafs/all_leafs_in_folder.txt b/leafs/all_leafs_in_folder.txt new file mode 100644 index 0000000..4c62b2e --- /dev/null +++ b/leafs/all_leafs_in_folder.txt @@ -0,0 +1 @@ +all_leafs_in_folder \ No newline at end of file diff --git a/leafs/leaf3.txt b/leafs/leaf3.txt new file mode 100644 index 0000000..1150d38 --- /dev/null +++ b/leafs/leaf3.txt @@ -0,0 +1 @@ +leaf3 \ No newline at end of file diff --git a/merging branches 1.txt b/merging branches 1.txt new file mode 100644 index 0000000..0e12d8a --- /dev/null +++ b/merging branches 1.txt @@ -0,0 +1,3 @@ +merging branches 1 +written in brach mergetest1 +written at branch mergetest2 \ No newline at end of file diff --git a/merging branches 1_inside mergtest1.txt b/merging branches 1_inside mergtest1.txt new file mode 100644 index 0000000..a4a29ba --- /dev/null +++ b/merging branches 1_inside mergtest1.txt @@ -0,0 +1,8 @@ +merging branches 1 +written in brach mergetest1 +written at branch mergetest2 +<<<<<<< HEAD +put this also in branch mergetest1 +======= +>>>>>>> mergetest2 + branch mergetest2 stays,and content from branch mergetest2 is addet to mergetest1 \ No newline at end of file diff --git a/remote test b/remote test new file mode 100644 index 0000000..e69de29