This repository has been archived on 2026-08-04. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Audrius Butkevicius 5fe15475a4 Merge pull request #1540 from calmh/conflicts ...

Handle conflicts when pulling (fixes #220)

2015-03-30 21:20:23 +01:00

..

testdata

Don't leave read only dir around, fails clean

2014-11-20 23:34:14 +01:00

debug.go

MPLv2

2015-03-17 16:02:27 +01:00

deviceactivity_test.go

MPLv2

2015-03-17 16:02:27 +01:00

deviceactivity.go

MPLv2

2015-03-17 16:02:27 +01:00

doc.go

MPLv2

2015-03-17 16:02:27 +01:00

folderstate.go

Refactor state tracking (...)

2015-03-17 19:37:06 +01:00

model_test.go

More graceful handling on folder errors (fixes #762)

2015-03-30 08:27:12 +02:00

model.go

More graceful handling on folder errors (fixes #762)

2015-03-30 08:27:12 +02:00

progressemitter_test.go

MPLv2

2015-03-17 16:02:27 +01:00

progressemitter.go

MPLv2

2015-03-17 16:02:27 +01:00

queue_test.go

MPLv2

2015-03-17 16:02:27 +01:00

queue.go

MPLv2

2015-03-17 16:02:27 +01:00

rofolder.go

More graceful handling on folder errors (fixes #762)

2015-03-30 08:27:12 +02:00

rwfolder_test.go

Update tests for version vectors

2015-03-25 23:10:33 +01:00

rwfolder.go

Merge pull request #1540 from calmh/conflicts

2015-03-30 21:20:23 +01:00

sharedpullerstate_test.go

MPLv2

2015-03-17 16:02:27 +01:00

sharedpullerstate.go

Handle conflicts when pulling (fixes #220)

2015-03-30 00:01:52 +02:00

tempname_windows.go

MPLv2

2015-03-17 16:02:27 +01:00

tempname.go

MPLv2

2015-03-17 16:02:27 +01:00

util.go

MPLv2

2015-03-17 16:02:27 +01:00