From: Eli Zaretskii <eliz@gnu.org>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: emacs-devel@gnu.org
Subject: Re: merge conlict?
Date: Mon, 25 Jan 2010 12:30:56 +0200 [thread overview]
Message-ID: <83r5pe5vdr.fsf@gnu.org> (raw)
In-Reply-To: <m2fx5ubi7c.fsf@igel.home>
> From: Andreas Schwab <schwab@linux-m68k.org>
> Cc: mhershberger@intrahealth.org, emacs-devel@gnu.org
> Date: Mon, 25 Jan 2010 11:19:03 +0100
>
> Eli Zaretskii <eliz@gnu.org> writes:
>
> >> Not much different from
> >> eg. yamaoka@jpl.org-20100121085911-ix6bp10z930y7zn8.
> >
> > That merge is made of Katsumi Yamaoka's changes.
>
> I don't understand that sentence. Can you clarify?
Compare the names of committers and log messages in this:
99377.1.10: Katsumi Yamaoka 2010-01-21 [merge] (Score File Format): Fix typo.
99266.1.23: Katsumi Yamaoka 2010-01-21 (Score File Format): Fix typo.
99266.1.22: Katsumi Yamaoka 2010-01-21 [merge] Merge from mainline.
99266.1.21: Katsumi Yamaoka 2010-01-20 [merge] Merge from mainline.
99266.1.20: Katsumi Yamaoka 2010-01-19 [merge] Merge from mainline.
99266.1.19: Katsumi Yamaoka 2010-01-19 [merge] Merge from mainline.
99266.1.18: Katsumi Yamaoka 2010-01-18 [merge] Merge from mainline.
99266.1.17: Katsumi Yamaoka 2010-01-18 [merge] Merge from mainline.
99266.1.16: Katsumi Yamaoka 2010-01-18 [merge] Merge from mainline.
99266.1.15: Katsumi Yamaoka 2010-01-17 [merge] Merge from mainline.
99266.1.14: Katsumi Yamaoka 2010-01-17 [merge] Merge from mainline.
99266.1.13: Katsumi Yamaoka 2010-01-14 [merge] Merge from mainline.
99266.1.12: Katsumi Yamaoka 2010-01-14 [merge] Merge from mainline.
99266.1.11: Katsumi Yamaoka 2010-01-13 [merge] Merge from mainline.
99266.1.10: Katsumi Yamaoka 2010-01-13 [merge] Merge from mainline.
99266.1.9: Katsumi Yamaoka 2010-01-13 [merge] Merge from mainline.
99266.1.8: Katsumi Yamaoka 2010-01-12 [merge] Merge from mainline.
99266.1.7: Katsumi Yamaoka 2010-01-12 [merge] Merge from mainline.
99266.1.6: Katsumi Yamaoka 2010-01-11 [merge] Merge from mainline.
99266.1.5: Katsumi Yamaoka 2010-01-08 [merge] Merge from mainline.
99266.1.4: Katsumi Yamaoka 2010-01-07 [merge] Merge from mainline.
99266.1.3: Katsumi Yamaoka 2010-01-06 [merge] Merge from mainline.
with this:
99379: Mark A. Hershberger 2010-01-24 [merge] merge conflict
99377.1.37: Stefan Monnier 2010-01-24 [merge] Try and fix bug#788, hopeful..
99377.3.1: Stefan Monnier 2010-01-24 * keymap.c (shadow_lookup): Add `re..
99377.1.36: Chong Yidong 2010-01-24 Use png_sig_cmp to allow linking with ..
99377.1.35: Dan Nicolaescu 2010-01-24 Remove support for adding --signoff ..
99377.1.34: Dan Nicolaescu 2010-01-24 (xterm-maybe-set-dark-background-mod..
99377.1.33: Glenn Morris 2010-01-24 Add the aliases bug-emacs and bug-gnum..
99377.1.32: Glenn Morris 2010-01-23 (aelement): Fix typo in previous.
99377.1.31: Glenn Morris 2010-01-23 Small fixes.
99377.1.30: Glenn Morris 2010-01-23 Fix some details of previous change.
99377.1.29: Glenn Morris 2010-01-23 Update X-Debbugs-CC details.
99377.1.28: Chong Yidong 2010-01-23 * emacs-lisp/advice.el (ad-set-orig-de..
99377.1.27: Chong Yidong 2010-01-23 * url-util.el: Require url-vars (Bug#5..
99377.1.26: Chong Yidong 2010-01-23 * emacs-lisp/assoc.el (aelement): Doc ..
99377.1.25: Chong Yidong 2010-01-23 * emacs-lisp/assoc.el (aput, adelete, ..
99377.1.24: Chong Yidong 2010-01-23 Account for utmp.h availability.
> > Which is not true for Mark's merge.
>
> Both commits merge trunk into a branch. How are they different?
Mark's branch seems to include commits that I think belong to
mainline.
next prev parent reply other threads:[~2010-01-25 10:30 UTC|newest]
Thread overview: 100+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <E1NZJ1t-00089o-ST@monty-python.gnu.org>
2010-01-25 7:43 ` merge conlict? Eli Zaretskii
2010-01-25 8:46 ` Glenn Morris
2010-01-25 9:29 ` Eli Zaretskii
2010-01-25 13:54 ` NEVER use `bzr push' for sending changes upstream (was: merge conlict?) Óscar Fuentes
2010-01-25 17:29 ` NEVER use `bzr push' for sending changes upstream Mark A. Hershberger
2010-01-25 18:28 ` Óscar Fuentes
2010-01-25 9:26 ` merge conlict? Andreas Schwab
2010-01-25 10:08 ` Eli Zaretskii
2010-01-25 10:19 ` Andreas Schwab
2010-01-25 10:30 ` Óscar Fuentes
2010-01-25 11:06 ` Andreas Schwab
2010-01-25 11:14 ` Eli Zaretskii
2010-01-25 11:27 ` Óscar Fuentes
2010-01-25 11:55 ` Teemu Likonen
2010-01-25 12:22 ` Óscar Fuentes
2010-01-25 12:34 ` Andreas Schwab
2010-01-25 12:48 ` Óscar Fuentes
2010-01-25 13:00 ` Andreas Schwab
2010-01-25 13:38 ` Óscar Fuentes
2010-01-25 14:26 ` Andreas Schwab
2010-01-25 14:39 ` Óscar Fuentes
2010-01-25 15:47 ` Andreas Schwab
2010-01-25 15:57 ` Óscar Fuentes
2010-01-25 16:10 ` Andreas Schwab
2010-01-25 18:06 ` Óscar Fuentes
2010-01-25 18:10 ` Andreas Schwab
2010-01-25 18:24 ` Óscar Fuentes
2010-01-25 18:31 ` Andreas Schwab
2010-01-25 18:50 ` Óscar Fuentes
2010-01-25 19:09 ` Andreas Schwab
2010-01-25 19:21 ` Óscar Fuentes
2010-01-25 19:39 ` Andreas Schwab
2010-01-25 20:07 ` Óscar Fuentes
2010-01-25 20:56 ` Andreas Schwab
2010-01-25 21:24 ` Óscar Fuentes
2010-01-25 21:44 ` Andreas Schwab
2010-01-25 23:19 ` Óscar Fuentes
2010-01-25 23:54 ` Andreas Schwab
2010-01-25 23:57 ` Óscar Fuentes
2010-01-26 2:02 ` Stefan Monnier
2010-01-26 9:08 ` Eli Zaretskii
2010-01-26 15:11 ` Stefan Monnier
2010-01-26 18:11 ` Eli Zaretskii
2010-01-26 15:15 ` Karl Fogel
2010-01-26 17:13 ` Stephen J. Turnbull
2010-01-26 17:09 ` Karl Fogel
2010-01-26 18:14 ` Eli Zaretskii
2010-01-25 22:10 ` David Reitter
2010-01-25 23:35 ` Óscar Fuentes
2010-01-26 0:03 ` Andreas Schwab
2010-01-26 1:38 ` Stephen J. Turnbull
2010-01-26 4:30 ` David Reitter
2010-01-25 13:41 ` Teemu Likonen
2010-01-25 13:52 ` Thierry Volpiatto
2010-01-25 12:30 ` Óscar Fuentes
2010-01-26 0:05 ` Richard Stallman
2010-01-26 1:49 ` Stephen J. Turnbull
2010-01-26 4:25 ` Eli Zaretskii
2010-01-26 9:16 ` Andreas Schwab
2010-01-26 10:31 ` Eli Zaretskii
2010-01-26 10:51 ` Andreas Schwab
2010-01-26 10:06 ` Óscar Fuentes
2010-01-26 16:49 ` Richard Stallman
2010-01-26 16:49 ` Richard Stallman
2010-01-26 17:50 ` Eli Zaretskii
2010-01-26 18:20 ` Lennart Borgman
2010-01-26 18:42 ` Karl Fogel
2010-01-26 19:10 ` Eli Zaretskii
2010-01-26 19:38 ` Stephen J. Turnbull
2010-01-26 22:43 ` Richard Stallman
2010-01-27 1:18 ` Stefan Monnier
2010-01-27 4:08 ` Eli Zaretskii
2010-01-25 10:30 ` Eli Zaretskii [this message]
2010-01-25 10:51 ` Andreas Schwab
2010-01-25 11:09 ` Eli Zaretskii
2010-01-25 12:36 ` Andreas Schwab
2010-01-25 12:43 ` Óscar Fuentes
2010-01-25 10:27 ` Óscar Fuentes
2010-01-26 3:02 ` Stefan Monnier
2010-01-26 8:38 ` Eli Zaretskii
2010-01-26 9:29 ` Andreas Schwab
2010-01-26 10:10 ` Óscar Fuentes
2010-01-26 10:28 ` Andreas Schwab
2010-01-26 12:40 ` Andreas Schwab
2010-01-25 11:33 ` Teemu Likonen
2010-01-25 12:02 ` Eli Zaretskii
2010-01-25 12:38 ` Andreas Schwab
2010-01-25 13:17 ` Teemu Likonen
2010-01-25 14:22 ` Eli Zaretskii
2010-01-25 14:03 ` Interpreting git diff --cc [was: merge conlict?] Stephen J. Turnbull
2010-01-26 0:05 ` merge conlict? Richard Stallman
2010-01-26 0:04 ` Richard Stallman
2010-01-26 2:14 ` Stephen J. Turnbull
2010-01-26 4:26 ` Eli Zaretskii
2010-01-26 16:50 ` Richard Stallman
2010-01-26 17:53 ` Eli Zaretskii
2010-01-28 2:10 ` Katsumi Yamaoka
2010-01-28 4:03 ` Eli Zaretskii
2010-01-28 4:13 ` Katsumi Yamaoka
2010-01-28 5:41 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83r5pe5vdr.fsf@gnu.org \
--to=eliz@gnu.org \
--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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.