public inbox for gcc-cvs-wwwdocs@sourceware.org help / color / mirror / Atom feed
From: jsm28@gcc.gnu.org To: gcc-cvs-wwwdocs@gcc.gnu.org Subject: gcc-wwwdocs branch master updated. 10da210590e8966a6c14aea0b1c13c58484b5224 Date: Tue, 14 Jan 2020 23:58:00 -0000 [thread overview] Message-ID: <20200114235836.117727.qmail@sourceware.org> (raw) 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 10da210590e8966a6c14aea0b1c13c58484b5224 (commit) from 29c11a61ae5e2b210cdf564ae7a49945afea2e44 (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 10da210590e8966a6c14aea0b1c13c58484b5224 Author: Joseph Myers <joseph@codesourcery.com> Date: Tue Jan 14 23:57:40 2020 +0000 Say more about conflict messages on git pull. Give an example of the message you get for such a conflict, and discuss options for keeping local changes when pulling. diff --git a/htdocs/git.html b/htdocs/git.html index 70cc7b7..725bd81 100644 --- a/htdocs/git.html +++ b/htdocs/git.html @@ -95,13 +95,30 @@ is: Autoconf, Bison, Xgettext, Automake, and Gperf.</p> <p>It is not uncommon to get Git conflict messages for some generated files when updating your local sources from the Git repository. Typically such -conflicts occur with autoconf generated files.</p> +conflicts occur with autoconf generated files. Such an error is of +the form:</p> + +<blockquote><pre> +error: Your local changes to the following files would be overwritten by merge: + gcc/configure +Please commit your changes or stash them before you merge. +Aborting +</pre></blockquote> <p>As long as you haven't been making modifications to the generated files or the generator files, it is safe to revert the local differences using <code>git checkout</code> on the affected files, then run <code>git pull</code> again.</p> +<p>If you have changes you want to keep that result in such an error, +there are a few options. You can keep those changes on a local branch +rather than on a branch tracking upstream sources. If you wish to +keep those changes uncommitted, do <code>git stash</code> +before <code>git pull</code> and <code>git stash pop</code> +after <code>git pull</code>. If you commit them directly to your +local upstream-tracking branch, you may prefer to use <code>git pull +--rebase</code> instead of plain <code>git pull</code>.</p> + <h2 id="tags">Branches and Tags</h2> ----------------------------------------------------------------------- Summary of changes: htdocs/git.html | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) hooks/post-receive -- gcc-wwwdocs
reply other threads:[~2020-01-14 23:58 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200114235836.117727.qmail@sourceware.org \ --to=jsm28@gcc.gnu.org \ --cc=gcc-cvs-wwwdocs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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).