From 97664eabd944f9d57b30946edea6407361ca58bf Mon Sep 17 00:00:00 2001 From: Jiri Hubacek Date: Fri, 12 Oct 2018 14:43:08 +0200 Subject: [PATCH] Add collaboration section to remote --- remote.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/remote.md b/remote.md index 327cbb2..2eba7dd 100644 --- a/remote.md +++ b/remote.md @@ -16,6 +16,14 @@ 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! -- 2.39.2