From 3dd7e33d29b41243065e24fc9f108d204ed527a8 Mon Sep 17 00:00:00 2001 From: Daniel Ziegler Date: Fri, 26 Jul 2024 13:52:11 +0200 Subject: [PATCH 01/14] remote test --- remote test | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 remote test diff --git a/remote test b/remote test new file mode 100644 index 0000000..e69de29 From ce91b18f41fea61cc98e74797cbe6e44b3ba84b6 Mon Sep 17 00:00:00 2001 From: Daniel Ziegler Date: Fri, 26 Jul 2024 13:58:15 +0200 Subject: [PATCH 02/14] remote test mit johannes --- further remote test | 1 + 1 file changed, 1 insertion(+) create mode 100644 further remote test 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 From 16d34fecba4e201e08ebe8dfbef9f756182216de Mon Sep 17 00:00:00 2001 From: Daniel Ziegler Date: Fri, 26 Jul 2024 14:02:27 +0200 Subject: [PATCH 03/14] testing --- Testing if I can Upload in the repository of Johannes | 1 + 1 file changed, 1 insertion(+) create mode 100644 Testing if I can Upload in the repository of Johannes 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..0a90125 --- /dev/null +++ b/Testing if I can Upload in the repository of Johannes @@ -0,0 +1 @@ +Testing \ No newline at end of file From dd925589159ffc9866b4428cb15a124888f12bf0 Mon Sep 17 00:00:00 2001 From: Daniel Ziegler Date: Fri, 26 Jul 2024 14:14:39 +0200 Subject: [PATCH 04/14] testing --- Testing if I can Upload in the repository of Johannes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Testing if I can Upload in the repository of Johannes b/Testing if I can Upload in the repository of Johannes index 0a90125..8f080bc 100644 --- a/Testing if I can Upload in the repository of Johannes +++ b/Testing if I can Upload in the repository of Johannes @@ -1 +1,2 @@ -Testing \ No newline at end of file +Testing further +Try to write at Johannes repository From 5682809b43985fdae0151639977b7287baa7421c Mon Sep 17 00:00:00 2001 From: Daniel Ziegler Date: Fri, 26 Jul 2024 14:15:51 +0200 Subject: [PATCH 05/14] sub-tree test --- Testing if I can Upload in the repository of Johannes | 1 + 1 file changed, 1 insertion(+) diff --git a/Testing if I can Upload in the repository of Johannes b/Testing if I can Upload in the repository of Johannes index 8f080bc..5b98db3 100644 --- a/Testing if I can Upload in the repository of Johannes +++ b/Testing if I can Upload in the repository of Johannes @@ -1,2 +1,3 @@ Testing further Try to write at Johannes repository +next try \ No newline at end of file From b75be81c6e2c828131b8e3e693ff8772481a9b6f Mon Sep 17 00:00:00 2001 From: Daniel Ziegler Date: Fri, 26 Jul 2024 14:21:01 +0200 Subject: [PATCH 06/14] leaf branch --- Testing if I can Upload in the repository of Johannes | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Testing if I can Upload in the repository of Johannes b/Testing if I can Upload in the repository of Johannes index 5b98db3..d6a2dbb 100644 --- a/Testing if I can Upload in the repository of Johannes +++ b/Testing if I can Upload in the repository of Johannes @@ -1,3 +1,5 @@ Testing further Try to write at Johannes repository -next try \ No newline at end of file +next try +Now create a branch in Johannes repository and call it leaf +with changing into leaf branch \ No newline at end of file From 16c17e84414d476691f5c3d7cd2274de15a3fd83 Mon Sep 17 00:00:00 2001 From: Daniel Ziegler Date: Fri, 26 Jul 2024 14:22:36 +0200 Subject: [PATCH 07/14] testing --- Testing if I can Upload in the repository of Johannes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Testing if I can Upload in the repository of Johannes b/Testing if I can Upload in the repository of Johannes index d6a2dbb..7d69029 100644 --- a/Testing if I can Upload in the repository of Johannes +++ b/Testing if I can Upload in the repository of Johannes @@ -2,4 +2,5 @@ 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 \ No newline at end of file +with changing into leaf branch +I have no permission to add it to the repository of Johannes \ No newline at end of file From 117746d1643516b655785485a49a0c539089f101 Mon Sep 17 00:00:00 2001 From: Daniel Ziegler Date: Fri, 26 Jul 2024 14:30:39 +0200 Subject: [PATCH 08/14] testing merging of branches --- merging branches 1.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 merging branches 1.txt diff --git a/merging branches 1.txt b/merging branches 1.txt new file mode 100644 index 0000000..cb6baeb --- /dev/null +++ b/merging branches 1.txt @@ -0,0 +1,3 @@ +merging branches 1 +written in brach mergetest1 +written at branch mergetest2 From 9a884ffcd136c2e80e73fbd04a9ba763d907fabb Mon Sep 17 00:00:00 2001 From: Daniel Ziegler Date: Fri, 26 Jul 2024 14:33:27 +0200 Subject: [PATCH 09/14] test txt for merging test --- merging branches 1.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 merging branches 1.txt diff --git a/merging branches 1.txt b/merging branches 1.txt new file mode 100644 index 0000000..7845a5b --- /dev/null +++ b/merging branches 1.txt @@ -0,0 +1,4 @@ +merging branches 1 +written in brach mergetest1 +written at branch mergetest2 +put this also in branch mergetest1 \ No newline at end of file From b6baf6be9583fa63eec37d9d2c3dc0805cb527ad Mon Sep 17 00:00:00 2001 From: Daniel Ziegler Date: Fri, 26 Jul 2024 14:42:42 +0200 Subject: [PATCH 10/14] testing --- merging branches 1_inside mergtest1.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 merging branches 1_inside mergtest1.txt diff --git a/merging branches 1_inside mergtest1.txt b/merging branches 1_inside mergtest1.txt new file mode 100644 index 0000000..1f9bbd1 --- /dev/null +++ b/merging branches 1_inside mergtest1.txt @@ -0,0 +1,7 @@ +merging branches 1 +written in brach mergetest1 +written at branch mergetest2 +<<<<<<< HEAD +put this also in branch mergetest1 +======= +>>>>>>> mergetest2 From 086e46ff5539eff34de521e78576c9c4f859144d Mon Sep 17 00:00:00 2001 From: Daniel Ziegler Date: Fri, 26 Jul 2024 14:45:31 +0200 Subject: [PATCH 11/14] merge testing --- merging branches 1_inside mergtest1.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/merging branches 1_inside mergtest1.txt b/merging branches 1_inside mergtest1.txt index 1f9bbd1..a4a29ba 100644 --- a/merging branches 1_inside mergtest1.txt +++ b/merging branches 1_inside mergtest1.txt @@ -5,3 +5,4 @@ written at branch mergetest2 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 From fe14f8e289d0daec73dd2da5b97c0c3b7f00acbb Mon Sep 17 00:00:00 2001 From: Daniel Ziegler Date: Fri, 26 Jul 2024 14:51:34 +0200 Subject: [PATCH 12/14] leafs --- leaf1.txt | 1 + leaf2.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 leaf1.txt create mode 100644 leaf2.txt 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 From a5a55f33ace08c167b3578c45e3641c605cc8606 Mon Sep 17 00:00:00 2001 From: Daniel Ziegler Date: Fri, 26 Jul 2024 14:56:06 +0200 Subject: [PATCH 13/14] leaf branches --- leafs/all_leafs_in_folder.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 leafs/all_leafs_in_folder.txt 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 From 6f27d10ea53d6c472b6b0cffde456099f6f45ef8 Mon Sep 17 00:00:00 2001 From: Daniel Ziegler Date: Fri, 26 Jul 2024 14:58:24 +0200 Subject: [PATCH 14/14] leaf3 --- leafs/leaf3.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 leafs/leaf3.txt 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