2007/6/7, Gerrit Pape <[EMAIL PROTECTED]>:
I failed to reproduce this from your description. Can you please check whether you still have the problem with the most recent version git-core 1:1.5.2.1-1,
I still have the branch there, and now git tell me that : CONFLICT (file/directory): There is a directory with name doc/api in 98b8697... Protegeons les link_to en provenance de la bdd,. Added doc/api as doc/api~HEAD (and this is true). Still the 98b86 commit does not contain any modification to file in the directory. how to reproduce : create a repos with a link in it, then in a branch, remove the link, and add a directory in place of the link (same name). Then try to cherry pick a commit from a branch where there is the directory into a branch where there is the link : it failed even if the modification ave nothing to do with said link/directory. a git repos can be found there : http://remi.vanicat.free.fr/test/ Thanks for your time -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
