Merge branch 'release/0.4.0'

[hubacji1/oneflow.git] / remote.md

diff --git a/remote.md b/remote.md
index 327cbb2061e8ec904154cc4587561b6a2cc0b709..cf030e86925736b7a4d3ff39b4cba79bba4df71d 100644 (file)
--- a/remote.md
+++ b/remote.md
@@ -16,11 +16,20 @@ forgotten (so the local changes looks like has been done just after copying
 repository from server is finished) it is preffered over `git pull` because the
 history is cleaner.
 
+# Collaboration
+Git can be used for collaboration even without branching. There are few rules
+that can ease the collaboration if keeped:
+- Git history on remote (shared) server must not be overwritten.
+- Every time before `git push` do `git pull --rebase`.
+  - And solve the conflicts.
+- Push to remote only clear, conflicts free git history.
+
 # Cheat sheet
 Use `git COMMAND --help` for showing the help!
 
 ## Remote
 - `git remote add NAME URL`
+- `git config --global branch.autosetuprebase always`
 
 ## Update
 - `git push`