From: "Stephen J. Turnbull" <stephen@xemacs.org>
To: Alan Mackenzie <acm@muc.de>
Cc: emacs-devel@gnu.org
Subject: Re: Stupid git!
Date: Tue, 15 Sep 2015 09:24:19 +0900 [thread overview]
Message-ID: <87613czg0c.fsf@uwakimon.sk.tsukuba.ac.jp> (raw)
In-Reply-To: <20150914104914.GB3208@acm.fritz.box>
Alan Mackenzie writes:
> Yes. I had misunderstood "conflict". I had thought it meant a merge
> conflict in some file, whereas it just meant that other, possibly
> unrelated, changes had taken place.
No, "conflict" means that there are conflicts in a file so that the
expected outcome of the merge is indeterminate, just like every other
VCS. There could be a bug in git's implementation, but this
terminology is standard in git as in other VCSes.
next prev parent reply other threads:[~2015-09-15 0:24 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-12 10:15 Stupid git! Alan Mackenzie
2015-09-12 10:21 ` Alan Mackenzie
2015-09-12 10:40 ` Dmitry Gutov
2015-09-12 12:29 ` Alan Mackenzie
2015-09-12 12:34 ` David Kastrup
2015-09-12 12:59 ` Alan Mackenzie
2015-09-12 20:14 ` Dmitry Gutov
2015-09-14 10:09 ` Steinar Bang
2015-09-12 20:37 ` Stefan Monnier
2015-09-12 10:40 ` David Kastrup
2015-09-12 10:53 ` Dmitry Gutov
2015-09-12 12:52 ` Alan Mackenzie
2015-09-12 11:45 ` Giuseppe Scrivano
2015-09-12 13:02 ` Alan Mackenzie
2015-09-12 14:12 ` Andreas Schwab
2015-09-12 15:16 ` Eli Zaretskii
2015-09-12 20:36 ` Alan Mackenzie
2015-09-12 20:43 ` Dmitry Gutov
2015-09-12 21:51 ` Alan Mackenzie
2015-09-13 6:22 ` Sven Axelsson
2015-09-14 10:21 ` Alan Mackenzie
2015-09-14 10:29 ` David Kastrup
2015-09-14 12:19 ` Eli Zaretskii
2015-09-14 12:28 ` David Kastrup
2015-09-14 12:37 ` Eli Zaretskii
2015-09-14 12:47 ` David Kastrup
2015-09-14 13:38 ` Eli Zaretskii
2015-09-14 13:44 ` David Kastrup
2015-09-14 12:38 ` Stefan Monnier
2015-09-13 6:49 ` Eli Zaretskii
2015-09-14 10:49 ` Alan Mackenzie
2015-09-15 0:24 ` Stephen J. Turnbull [this message]
2015-09-13 20:28 ` Dmitry Gutov
2015-09-14 3:11 ` Stephen J. Turnbull
2015-09-14 13:47 ` Dmitry Gutov
2015-09-14 11:09 ` Alan Mackenzie
2015-09-14 12:22 ` Eli Zaretskii
2015-09-14 13:42 ` Dmitry Gutov
2015-09-14 17:05 ` Steinar Bang
2015-09-14 10:37 ` Steinar Bang
2015-09-13 6:42 ` Eli Zaretskii
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87613czg0c.fsf@uwakimon.sk.tsukuba.ac.jp \
--to=stephen@xemacs.org \
--cc=acm@muc.de \
--cc=emacs-devel@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
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).