Re: [PATCH v2] push: point to 'git pull' and 'git push --force' in case of non-fast forward
From: Teemu Likonen <hidden>
Date: 2016-06-15 22:47:12
On 2009-08-08 09:51 (+0200), Matthieu Moy wrote:
'git push' failing because of non-fast forward is a very common situation, and a beginner does not necessarily understand "fast forward" immediately.
quoted hunk
+ if (nonfastforward) { + printf("Push was rejected because it would not result in a fast forward:\n" + "Merge in the remote changes (using git pull) before pushing yours,\n" + "or use git push --force to discard the remote changes.\n" + "See 'non-fast forward' section of 'git push --help' for details.\n"); + }
I'd like to add that some projects that use Git in (partially) centralized manner prefer "git pull --rebase" before "git push".