18 lines
407 B
Markdown
18 lines
407 B
Markdown
# Hello there
|
|
|
|
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!
|
|
but what if i push a commit from else where, how gitbook will resolve that ?
|
|
|
|
ok i can pull
|
|
|
|
and what about conflicts ?
|
|
|
|
here is what would cause a conflict hehe.
|
|
|
|
ok well done, gitbook is able to resolve conflicts!
|
|
|