Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better handling for multiple files from same repository #451

Merged
merged 2 commits into from Dec 12, 2014

Conversation

@mexx
Copy link
Member

mexx commented Dec 12, 2014

related to #407

  • Add conflict detection for source files
  • Adjust download process for source files to ensure all files are correctly downloaded during restore process
@@ -61,6 +65,31 @@ let resolve getDependencies getSha1 (file : UnresolvedSourceFile) : ResolvedSour

{ resolved with Dependencies = dependencies }

let private detectConflicts (remoteFiles : UnresolvedSourceFile list) : unit =

This comment has been minimized.

Copy link
@forki

forki Dec 12, 2014

Member

can we get detectConflicts under test?

@forki forki merged commit 0eedab1 into fsprojects:master Dec 12, 2014
2 checks passed
2 checks passed
continuous-integration/appveyor AppVeyor build succeeded
Details
continuous-integration/travis-ci The Travis CI build passed
Details
@mexx mexx deleted the mexx:multiple-files branch Dec 13, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.