{"thread":{"id":"25593","subject":"conflict merging directory replaced by symlink","startedAt":"2010-10-29T17:32:32Z","lastAt":"2010-10-29T17:32:32Z","messageCount":1,"participants":["Mischa POSLAWSKY"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"154798","messageId":"20101029173232.GA9869@pearl.mediadesign.nl","threadId":"25593","inReplyTo":null,"subject":"conflict merging directory replaced by symlink","fromName":"Mischa POSLAWSKY","fromEmail":"shiar@shiar.nl","sentAt":"2010-10-29T17:32:32Z","receivedAt":"2010-10-29T17:32:32Z","isPatch":false,"sender":{"key":"shiar@shiar.nl","avatar":null},"body":"Hello list,\n\nAfter replacing a directory by a symlink, branches without that change will\nconflict whenever they change something unrelated in the link target.\nTo illustrate:\n\n\tgit init &&\n\tmkdir common &&\n\ttouch common/test &&\n\tgit add common/test &&\n\tmkdir dupe &&\n\ttouch dupe/test &&\n\tgit add dupe/test && \n\tgit commit -m 'initial setup' &&\n\n\tgit rm -r dupe &&\n\tln -s common dupe &&\n\tgit add dupe &&\n\tgit commit -m 'replace dir by symlink' &&\n\n\tgit checkout -b prelink HEAD^ &&\n\ttouch common/irrelevant &&\n\tgit add common/irrelevant &&\n\tgit commit -m 'additional common file' &&\n\n\tgit checkout - &&\n\tgit merge prelink\n\nfails in git v1.7.2.3 with:\n> CONFLICT (file/directory): There is a directory with name dupe in prelink.\n> Adding dupe as dupe~HEAD\n> Automatic merge failed; fix conflicts and then commit the result.\n\nI'd expect the same resolution as when adding a symlink from a different\nname, without replacing the directory, but this happily merges without\nraising a fuss.\n\nDoes anyone recognise or know a reason for this behaviour?\n\nThanks!\n-- \nMischa\n"}]}