adr3nald0s@xxxxxxxxx wrote:
> On a clone of linux-2.6:
>
> git checkout -b topic/test v2.6.15
> touch drivers/a-file.c
> git add drivers/a-file.c
> git commit -m 'Add a file'
> git checkout -b temp0 v2.6.16
> git rebase topic/test
>
> I get the following:
>
> Applying [ACPI] handle ACPICA 20050916's acpi_resource.type rename
..
> CONFLICT (content): Merge conflict in drivers/char/hpet.c
..
> Is this a bug, or is there a reason I am seeing conflicts in files
> I've never touched?
You are using the rebase the wrong way round.
The (first) argument to git rebase tells *where the current branch* will be
moved to, and not *which branch to move*.
So, instead of last two commands (git checkout...; git rebase...) you say
git rebase v2.6.16
and you don't need the branch temp0.
-- Hannes
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
