This is the mail archive of the
mailing list for the Archer project.
Re: Problem merging with git
Jan Kratochvil wrote:
On Wed, 18 Feb 2009 16:49:28 +0100, Rick Moseley wrote:
I am used to seeing messages like this:
CONFLICT (content): Merge conflict in COPYING.NEWLIB
This should never happen as AFAIK no branch in the Archer project should
modify files like COPYING.NEWLIB. If you see this message someone (who you
merge from) had to do something unclean regarding the branching/versioning.
IMO you should postpone such merge and ask the author to fixup his branch
first otherwise you start cluttering by needless conflict resolutions the
for i in `git branch -r|grep archer-`;do git diff origin/master...$i|grep -q COPYING.NEWLIB && echo $i;done
(sure just a consequence) origin/archer-rmoseley-fedora-merge
I am a GIT newbie so please correct me if diff
origin/master...origin/archer-BRANCH is not appropriate way how to show the
branch-specific changes against upstream ignoring any differences due to
possibly newer origin/master.
Now I am trying to merge Jan's archer-jankratochvil-vla branch and I am
seeing something different and I am wondering what the heck I am doing
wrong. Here is the sequence:
Just the merge with archer-jankratochvil-vla happened the way how every other
merge should happen in most cases.
Merge made by recursive.
After that, I do this:
# On branch archer-rmoseley-f11-merge
nothing to commit (working directory clean)
git does not seem to acknowledge that files have changed.
The last merge is visible in `git log', isn't it?
Yes, it appears to be:
Merge: e947ab6... 9d03935...
Author: Rick Moseley <firstname.lastname@example.org>
Date: Wed Feb 18 09:18:30 2009 -0600
Merge branch 'archer-jankratochvil-vla' of
ssh://sources.redhat.com/git/archer into archer-rmoseley-f11-merge
Author: Nick Clifton <email@example.com>
Date: Thu Feb 12 15:06:54 2009 +0000
* elflink.c (bfd_elf_final_link): When counting the relocations,
if the header size has not been set yet then assume that it will
match the output section's reloc type.
Author: Jan Kratochvil <firstname.lastname@example.org>
Date: Thu Feb 12 09:15:06 2009 +0000
* dwarf2read.c (process_die <DW_TAG_module>, read_module)
(scan_partial_symbols <DW_TAG_module>, add_partial_module): New.
* gdb.fortran/module.exp, gdb.fortran/module.f90: New.
Author: Nathan Sidwell <email@example.com>
Date: Thu Feb 12 08:31:02 2009 +0000
* config/tc-m68k.c (mcf51qe_ctrl): Add CPUCR.
(mcf52259_ctrl, mcf52277_ctrl, mcf53017_ctrl): New.
(mcf5307_ctrl): Add VBR.
(no_mac): New variable.
(m68k_extensions): Refer to no_mac mask.