Re: merge conlict?

[Eli Zaretskii]

> From: Andreas Schwab <address@hidden>
> Cc: address@hidden,  address@hidden
> Date: Mon, 25 Jan 2010 11:19:03 +0100
> 
> Eli Zaretskii <address@hidden> writes:
> 
> >> Not much different from
> >> eg. address@hidden
> >
> > 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.