diff options
| author | Petter Rasmussen | 2016-02-13 01:09:47 +0100 |
|---|---|---|
| committer | Petter Rasmussen | 2016-02-13 01:10:17 +0100 |
| commit | 12e431b5e17ff4ceb6680987bd4649a94b83f896 (patch) | |
| tree | ae18b93e74026fe60f4b02a2be9839e32fc4231d /handlers_drive.go | |
| parent | 5eae4f159d340d257e41e75604a0fc831cb76381 (diff) | |
| download | gdrive-12e431b5e17ff4ceb6680987bd4649a94b83f896.tar.bz2 | |
Add conflict handling and flags for uploads
Diffstat (limited to 'handlers_drive.go')
| -rw-r--r-- | handlers_drive.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/handlers_drive.go b/handlers_drive.go index aaf957c..9f85fd6 100644 --- a/handlers_drive.go +++ b/handlers_drive.go @@ -128,6 +128,7 @@ func uploadSyncHandler(ctx cli.Context) { DryRun: args.Bool("dryRun"), DeleteExtraneous: args.Bool("deleteExtraneous"), ChunkSize: args.Int64("chunksize"), + Resolution: conflictResolution(args), Comparer: NewCachedMd5Comparer(cachePath), }) checkErr(err) |