From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 117799 invoked by alias); 14 Jan 2020 23:58:37 -0000 Mailing-List: contact gcc-cvs-wwwdocs-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-cvs-wwwdocs-owner@gcc.gnu.org Received: (qmail 117731 invoked by uid 9119); 14 Jan 2020 23:58:36 -0000 Date: Tue, 14 Jan 2020 23:58:00 -0000 Message-ID: <20200114235836.117727.qmail@sourceware.org> From: jsm28@gcc.gnu.org To: gcc-cvs-wwwdocs@gcc.gnu.org Subject: gcc-wwwdocs branch master updated. 10da210590e8966a6c14aea0b1c13c58484b5224 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 29c11a61ae5e2b210cdf564ae7a49945afea2e44 X-Git-Newrev: 10da210590e8966a6c14aea0b1c13c58484b5224 X-SW-Source: 2020/txt/msg00029.txt 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 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.

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.

+conflicts occur with autoconf generated files. Such an error is of +the form:

+ +
+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
+

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 git checkout on the affected files, then run git pull again.

+

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 git stash +before git pull and git stash pop +after git pull. If you commit them directly to your +local upstream-tracking branch, you may prefer to use git pull +--rebase instead of plain git pull.

+

Branches and Tags

----------------------------------------------------------------------- Summary of changes: htdocs/git.html | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) hooks/post-receive -- gcc-wwwdocs