Repository navigation

[stable-35.0.x] Fix conflicts for offline uploads when uploading same file again - #17758

Merged

alperozturk96 merged 22 commits into

stable-35.0.xfrom

backport/17590/stable-35.0.x

Oct 14, 2026

Merged

[stable-35.0.x] Fix conflicts for offline uploads when uploading same file again#17758
alperozturk96 merged 22 commits into
stable-35.0.xfrom
backport/17590/stable-35.0.x

Commits on Oct 14, 2026
- fix/internal-104835: do not overwrite existent file metadata
  
  daniele-verducci
  authored and
  alperozturk96
  committed
  7e7f11e
- wip
  
  daniele-verducci
  authored and
  alperozturk96
  committed
  7f3e094
- fix/internal-104835: avoid showing conflict window for an unmodified, already uploaded file
  
  daniele-verducci
  authored and
  alperozturk96
  committed
  f02720b
- fix/internal-104835: check size as well
  
  daniele-verducci
  authored and
  alperozturk96
  committed
  7501e93
- fix/internal-104835: lint
  
  daniele-verducci
  authored and
  alperozturk96
  committed
  73898f7
- Refactored java function: moved into FileExtensions
  
  daniele-verducci
  authored and
  alperozturk96
  committed
  96307e0
- Removed wrongly-placed file update code from uploadworker and updaging etagOnServer field properly in UploadFileOperation
  
  daniele-verducci
  authored and
  alperozturk96
  committed
  137175a
- Fixed detekt
  
  daniele-verducci
  authored and
  alperozturk96
  committed
  d9280f5
- Working conflict resolution for "keep both" in offline upload, aligned new name to the one used for online
  
  daniele-verducci
  authored and
  alperozturk96
  committed
  018cd57
- Applied suggestions from PR
  
  daniele-verducci
  authored and
  alperozturk96
  committed
  2384752
- Applied some proposed fixes from PR
  
  daniele-verducci
  authored and
  alperozturk96
  committed
  a362930
- Implemented file conflict name generator specific for offlineOperations
  
  daniele-verducci
  authored and
  alperozturk96
  committed
  96baff8
- Tests for file conflict name generator specific for offlineOperations
  
  daniele-verducci
  authored and
  alperozturk96
  committed
  e2cce8c
- Fixed bug in duplicate files renaming generator, fixed test
  
  daniele-verducci
  authored and
  alperozturk96
  committed
  f812528
- Moved regexp outside of recurrency
  
  daniele-verducci
  authored and
  alperozturk96
  committed
  ede6036
- Removed unreliable file creation date check
  
  daniele-verducci
  authored and
  alperozturk96
  committed
  859a320
- Tests for OCFile.isTheSameAs() extension
  
  daniele-verducci
  authored and
  alperozturk96
  committed
  102680e
- Fixed lint
  
  daniele-verducci
  authored and
  alperozturk96
  committed
  a18cc7d
- de-duplicate tests
  alperozturk96
  committed
  ff885ae
- Fixed getRemotePathForConflictResolution (broken after refactoring), written relevant test
  
  daniele-verducci
  authored and
  alperozturk96
  committed
  11fff0a
- Fixed lint
  
  daniele-verducci
  authored and
  alperozturk96
  committed
  ebb969e
- add missing backports
  alperozturk96
  committed
  5364eac

Commits

Commits on Oct 14, 2026