From cd579b801d1e96f7366a3ca3c3aa902dc4b60659 Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Wed, 8 Feb 2017 17:03:35 +0100 Subject: [PATCH] Updates first-page.md Auto commit by GitBook Editor --- first-page.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/first-page.md b/first-page.md index 66fbef0..2767b9e 100644 --- a/first-page.md +++ b/first-page.md @@ -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 ? + + +