mirror of
https://github.com/floccusaddon/floccus.git
synced 2026-04-25 14:16:12 +03:00
Labels
No labels
browser-specific
bug
correctness issues
enhancement
feature: Google Drive
feature: Linkwarden
feature: git
feature: nextcloud-bookmarks
feature: tabs
feature: webdav
help wanted
native-app
priority: high
priority: low
priority: medium
pull-request
question
question
stale
upstream
waiting for more information
wontfix
🙁 Not following issue template
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
starred/floccus#1771
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/floccusaddon/floccus/pull/865
Author: @marcelklehr
Created: 4/8/2021
Status: ✅ Merged
Merged: 4/8/2021
Merged by: @marcelklehr
Base:
develop← Head:fix/concurrent-move-update📝 Commits (4)
5ed2e31Tests: Extend tests to account for #839dcf9502DefaultSyncStrategy: Fix UPDATE vs REMOVE conditionceef011Scanner: Don't generate UPDATEs for items that have been MOVEdf038912Unidirectional: Don't map UPDATEs to old IDs, but to newly reinserted IDs📊 Changes
5 files changed (+54 additions, -25 deletions)
View changed files
📝
src/lib/Scanner.ts(+15 -2)📝
src/lib/strategies/Default.ts(+21 -11)📝
src/lib/strategies/Merge.ts(+4 -8)📝
src/lib/strategies/Unidirectional.ts(+8 -4)📝
src/test/test.js(+6 -0)📄 Description
No description provided
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.