Johannes Sixt <johannes.sixt@xxxxxxxxxx> writes: > On Saturday 03 March 2007 20:32, Johannes Sixt wrote: >> If the file system does not support symbolic links (core.symlinks=false), >> merge-recursive must write the merged symbolic link text into a regular >> file. > > But how to resolve such a conflict if core.symlinks=false? > > It turns out that git-add cannot honor the symlink property recorded in the > index because read_cache.c:add_file_to_index() will find only entries at > stage 0, but the conflicting entries are at stages 2 and 3. Can there be > something done about that? You can always use --index-info. - 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