Hi, On Wed, 13 Jun 2007, Gerrit Pape wrote: > $ mkdir repo && cd repo > $ git init > Initialized empty Git repository in .git/ > $ echo foo >file > $ ln -s dangling link > $ git add . > $ git commit -mfoo > Created initial commit c6a9189: foo > 2 files changed, 2 insertions(+), 0 deletions(-) > create mode 100644 file > create mode 120000 link So, basically your master has a file and a symbolic link. > $ git checkout -b branch > Switched to a new branch "branch" > $ git rm link > rm 'link' > $ git commit -mremovelink > Created commit 2c60f15: removelink > 1 files changed, 0 insertions(+), 1 deletions(-) > delete mode 120000 link Here, you remove the link from the branch. > $ mkdir link > $ echo bar >link/file > $ git add link > $ git commit -m adddir > Created commit d3b30b5: adddir > 1 files changed, 1 insertions(+), 0 deletions(-) > create mode 100644 link/file Here you added a directory of the same name as the symbolic link has in master. > $ git checkout master > Switched to branch "master" > $ git cherry-pick 8ddc4d5 > CONFLICT (file/directory): There is a directory with name link in > 8ddc4d5... file. Added link as link~HEAD Here you _still_ have the file in master. So that conflict is really expected, since a cherry-pick will only do a three-way merge. I guess you want to use git-rebase instead. Ciao, Dscho - 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
