From: Stephen Berman <stephen.berman@gmx.net>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: emacs-devel@gnu.org
Subject: Re: info files
Date: Mon, 23 Dec 2013 18:17:20 +0100 [thread overview]
Message-ID: <87vbyftrkv.fsf@rosalinde.fritz.box> (raw)
In-Reply-To: <874n5za3xe.fsf@igel.home> (Andreas Schwab's message of "Mon, 23 Dec 2013 18:10:53 +0100")
On Mon, 23 Dec 2013 18:10:53 +0100 Andreas Schwab <schwab@linux-m68k.org> wrote:
> Stephen Berman <stephen.berman@gmx.net> writes:
>
>> So I suppose the next time I update the branch I'll get a conflict
>> again
>
> No, you won't. It's now an ignored directory.
Ah, ok; thanks. (I guess it would have been more polite to just wait
till I could update again, then I would have seen no conflict, but
thanks for indulging my impatience.)
Steve Berman
next prev parent reply other threads:[~2013-12-23 17:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-23 16:07 info files Stephen Berman
2013-12-23 17:10 ` Andreas Schwab
2013-12-23 17:17 ` Stephen Berman [this message]
2013-12-24 2:30 ` Stephen J. Turnbull
2013-12-24 5:50 ` Paul Eggert
2013-12-24 6:32 ` Stephen J. Turnbull
2013-12-24 18:02 ` Paul Eggert
2013-12-24 18:14 ` Eli Zaretskii
2013-12-24 18:27 ` Lars Ingebrigtsen
2013-12-24 18:37 ` Lars Ingebrigtsen
2013-12-24 18:52 ` Eli Zaretskii
2013-12-24 19:28 ` Stefan Monnier
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=87vbyftrkv.fsf@rosalinde.fritz.box \
--to=stephen.berman@gmx.net \
--cc=emacs-devel@gnu.org \
--cc=schwab@linux-m68k.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).