From: Andreas Schwab <schwab@linux-m68k.org>
To: Lars Ingebrigtsen <larsi@gnus.org>
Cc: Raphael Kubo da Costa <rakuco@FreeBSD.org>, ding@gnus.org
Subject: Re: New branch for No Gnus
Date: Tue, 31 Jan 2012 20:59:29 +0100 [thread overview]
Message-ID: <m2d39zve1q.fsf@igel.home> (raw)
In-Reply-To: <87obtj4sqf.fsf@gnus.org> (Lars Ingebrigtsen's message of "Tue, 31 Jan 2012 19:44:24 +0100")
Lars Ingebrigtsen <larsi@gnus.org> writes:
> So I should just merge, and then delete all the stuff that Git put into
> Ma Gnus from No Gnus? (I mean, right now. None of the changes to No
> Gnus, which are just version numbers, apply to Ma Gnus.)
You will get a merge conflict, which you resolve.
$ git merge origin/no-gnus
Auto-merging texi/message.texi
CONFLICT (content): Merge conflict in texi/message.texi
Auto-merging texi/gnus.texi
CONFLICT (content): Merge conflict in texi/gnus.texi
Auto-merging lisp/gnus.el
CONFLICT (content): Merge conflict in lisp/gnus.el
Auto-merging lisp/ChangeLog
Recorded preimage for 'lisp/gnus.el'
Recorded preimage for 'texi/gnus.texi'
Recorded preimage for 'texi/message.texi'
Automatic merge failed; fix conflicts and then commit the result.
The messages about recording preimage are part of the rerere support.
There is no conflict report for lisp/ChangeLog since I have set up
git-merge-changelog. Use git reset --merge to abort a failed merge.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next prev parent reply other threads:[~2012-01-31 19:59 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-28 18:50 Lars Ingebrigtsen
2012-01-28 19:29 ` Raphael Kubo da Costa
2012-01-30 17:02 ` Lars Ingebrigtsen
2012-01-28 19:45 ` Andreas Schwab
2012-01-28 20:42 ` Steinar Bang
2012-01-30 17:36 ` Lars Ingebrigtsen
2012-01-30 21:24 ` Steinar Bang
2012-01-30 22:05 ` Lars Ingebrigtsen
2012-01-31 16:16 ` Steinar Bang
2012-01-31 17:02 ` Lars Ingebrigtsen
2012-01-31 17:07 ` Richard Riley
2012-01-31 17:14 ` Lars Ingebrigtsen
2012-01-31 17:50 ` Richard Riley
2012-01-31 18:36 ` Raphael Kubo da Costa
2012-01-31 18:44 ` Lars Ingebrigtsen
2012-01-31 18:52 ` Raphael Kubo da Costa
2012-01-31 18:58 ` Lars Ingebrigtsen
2012-01-31 19:15 ` Raphael Kubo da Costa
2012-01-31 19:59 ` Andreas Schwab [this message]
2012-01-31 20:59 ` Steinar Bang
2012-01-31 22:49 ` Lars Ingebrigtsen
2012-02-01 0:07 ` Raphael Kubo da Costa
2012-02-01 0:31 ` Lars Ingebrigtsen
2012-02-01 0:40 ` Raphael Kubo da Costa
2012-02-01 8:46 ` Steinar Bang
2012-02-01 0:36 ` Andreas Schwab
2012-02-01 0:38 ` Katsumi Yamaoka
2012-02-01 1:13 ` Lars Ingebrigtsen
2012-02-01 1:32 ` Katsumi Yamaoka
2012-02-01 2:22 ` Lars Ingebrigtsen
2012-02-01 2:33 ` Lars Ingebrigtsen
2012-02-01 8:51 ` Steinar Bang
2012-02-01 13:03 ` Lars Ingebrigtsen
2012-02-01 14:30 ` Steinar Bang
2012-02-01 18:26 ` Ted Zlatanov
2012-02-01 18:30 ` Lars Ingebrigtsen
2012-02-01 18:56 ` Ted Zlatanov
2012-02-01 21:59 ` Steinar Bang
2012-02-01 22:03 ` Ted Zlatanov
2012-02-01 22:24 ` Lars Ingebrigtsen
2012-02-01 22:43 ` Andreas Schwab
2012-02-01 8:24 ` Steinar Bang
2012-01-31 22:50 ` Lars Ingebrigtsen
2012-01-31 22:59 ` Lars Ingebrigtsen
2012-01-31 23:05 ` Lars Ingebrigtsen
2012-01-31 23:26 ` Lars Ingebrigtsen
2012-01-31 23:32 ` Lars Ingebrigtsen
2012-01-31 23:37 ` Lars Ingebrigtsen
2012-01-31 23:58 ` Lars Ingebrigtsen
2012-02-01 0:46 ` Andreas Schwab
2012-02-01 1:14 ` Lars Ingebrigtsen
2012-02-01 1:16 ` Lars Ingebrigtsen
2012-02-01 9:10 ` Steinar Bang
2012-02-01 13:19 ` Lars Ingebrigtsen
2012-02-01 11:31 ` Andreas Schwab
2012-02-01 13:03 ` Lars Ingebrigtsen
2012-01-31 20:56 ` Steinar Bang
2012-02-01 16:22 ` Eric S Fraga
2012-02-01 1:47 ` Michael Welsh Duggan
2012-01-30 17:34 ` Lars Ingebrigtsen
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=m2d39zve1q.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=ding@gnus.org \
--cc=larsi@gnus.org \
--cc=rakuco@FreeBSD.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.
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 NNTP newsgroup(s).