fix: correctly merge conflicting paths when files (instead of dirs) are being linked#3458

rickeylev merged 4 commits into

bazel-contrib:mainbazel-contrib/rules_python:mainfrom

rickeylev:fix.conflict.merging.filesrickeylev/rules_python:fix.conflict.merging.filesCopy head branch name to clipboard