|
@@ -4,6 +4,12 @@ so we are glad to test this new tool gitbook
|
|
|
|
|
|
but will we be able to use the desktop editor with out the online gitbook service ?
|
|
|
|
|
|
-ok i can push to gogs with gitbook, good!
|
|
|
+ok i can push to gogs with gitbook, good!
|
|
|
but what if i push a commit from else where, how gitbook will resolve that ?
|
|
|
|
|
|
+ok i can pull
|
|
|
+
|
|
|
+and what about conflicts ?
|
|
|
+
|
|
|
+
|
|
|
+
|