Re: Problem merging with git

[Jan Kratochvil <jan dot kratochvil at redhat dot com>]

On Wed, 18 Feb 2009 16:49:28 +0100, Rick Moseley wrote:
> I am used to seeing messages like this:
>
> Auto-merged COPYING.NEWLIB
> 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
merge branch.

According to
	for i in `git branch -r|grep archer-`;do git diff origin/master...$i|grep -q COPYING.NEWLIB && echo $i;done
these are
	origin/archer-pmuldoon-pretty-printers-lookup
	origin/archer-tromey-python
	(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.

...
> Auto-merged gdb/dwarf2read.c
> Merge made by recursive.
...
> After that, I do this:
>
> git status
> # 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?



Regards,
Jan