Skip to content

Better handling for multiple files from same repository - #451

Merged
forki merged 2 commits into
fsprojects:masterfrom
mexx:multiple-files
Dec 12, 2014
Merged

Better handling for multiple files from same repository#451
forki merged 2 commits into
fsprojects:masterfrom
mexx:multiple-files

Conversation

@mexx

@mexx mexx commented Dec 12, 2014

Copy link
Copy Markdown
Contributor

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

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we get detectConflicts under test?

@forki
forki merged commit 0eedab1 into fsprojects:master Dec 12, 2014
@mexx
mexx deleted the multiple-files branch December 13, 2014 18:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants