|
|
@@ -1,3 +1,19 @@
|
|
|
# Shared_test
|
|
|
|
|
|
-Test repo for Learn something new 13-11-2020 Simlab neuroscience, JSC, FZJ
|
|
|
+Test repo for Learn something new 13-11-2020 Simlab neuroscience, JSC, FZJ
|
|
|
+
|
|
|
+Resultd:
|
|
|
+
|
|
|
+We tried concurrent uploading and changing of files to stress the system and now have a repo that is broken.
|
|
|
+
|
|
|
+C:\Users\wfakl>gin get w.klijn/Shared_test
|
|
|
+Downloading repository OK
|
|
|
+Initialising local storage OK
|
|
|
+
|
|
|
+C:\Users\wfakl>cd Shared_test
|
|
|
+
|
|
|
+C:\Users\wfakl\Shared_test>gin download
|
|
|
+:: Downloading changes [error] download failed: files changed locally and remotely and cannot be automatically merged (merge conflict):
|
|
|
+testfile, brent-represent.md
|
|
|
+
|
|
|
+
|
