public inbox for gcc-cvs-wwwdocs@sourceware.org
help / color / mirror / Atom feed
* gcc-wwwdocs branch master updated. 4ce5c94abb8129cb0182acade6a0504d58e8799f
@ 2020-01-14 23:45 jsm28
0 siblings, 0 replies; only message in thread
From: jsm28 @ 2020-01-14 23:45 UTC (permalink / raw)
To: gcc-cvs-wwwdocs
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gcc-wwwdocs".
The branch, master has been updated
via 4ce5c94abb8129cb0182acade6a0504d58e8799f (commit)
from c4df04644677895890df1c0dc24c6f3c157f90a8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4ce5c94abb8129cb0182acade6a0504d58e8799f
Author: Joseph Myers <joseph@codesourcery.com>
Date: Tue Jan 14 23:42:42 2020 +0000
Give example of error message when pushing to a branch with other changes.
Giving explicit example of git messages seems helpful for novice users
to understand when they are in a particular situation for which
instructions are given.
diff --git a/htdocs/gitwrite.html b/htdocs/gitwrite.html
index f420fe2..e55cfa9 100644
--- a/htdocs/gitwrite.html
+++ b/htdocs/gitwrite.html
@@ -279,7 +279,19 @@ A message will be sent to the gcc-cvs mailing list indicating that a
change was made. If <code>git push</code> gives an error because
someone else has pushed their own changes to the same branch,
do <code>git pull --rebase</code> before trying <code>git push</code>
-again.</li>
+again. A typical error in this situation looks like:
+
+<blockquote><pre>
+To git+ssh://gcc.gnu.org/git/gcc.git
+ ! [rejected] master -> master (fetch first)
+error: failed to push some refs to 'git+ssh://gcc.gnu.org/git/gcc.git'
+hint: Updates were rejected because the remote contains work that you do
+hint: not have locally. This is usually caused by another repository pushing
+hint: to the same ref. You may want to first integrate the remote changes
+hint: (e.g., 'git pull ...') before pushing again.
+hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+</pre></blockquote>
+</li>
</ol>
<hr />
-----------------------------------------------------------------------
Summary of changes:
htdocs/gitwrite.html | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
hooks/post-receive
--
gcc-wwwdocs
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-01-14 23:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-14 23:45 gcc-wwwdocs branch master updated. 4ce5c94abb8129cb0182acade6a0504d58e8799f jsm28
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).