[PR #706] [MERGED] Fix unidir merge #1719

New issue

Closed

opened 2026-02-25 23:30:37 +03:00 by kerem · 0 comments

kerem commented

2026-02-25 23:30:37 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/floccusaddon/floccus/pull/706
Author: @marcelklehr
Created: 10/24/2020
Status: ✅ Merged
Merged: 10/26/2020
Merged by: @marcelklehr

Base: develop ← Head: fix/unidir-merge

📝 Commits (2)

f315527 Sync: Fix unidirectional strategies when no cache is available
6aaae95 Sync: Detect moves of bookmarks even when ID changed

📊 Changes

11 files changed (+259 additions, -50 deletions)

View changed files

📝 package-lock.json (+3 -3)
📝 package.json (+1 -1)
📝 src/lib/Account.js (+18 -6)
📝 src/lib/Diff.ts (+29 -18)
📝 src/lib/Scanner.ts (+6 -5)
📝 src/lib/adapters/NextcloudFolders.ts (+1 -1)
📝 src/lib/strategies/Merge.ts (+1 -1)
📝 src/lib/strategies/Overwrite.ts (+2 -6)
➕ src/lib/strategies/OverwriteMerge.ts (+101 -0)
📝 src/lib/strategies/Slave.ts (+14 -9)
➕ src/lib/strategies/SlaveMerge.ts (+83 -0)

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/floccusaddon/floccus/pull/706 **Author:** [@marcelklehr](https://github.com/marcelklehr) **Created:** 10/24/2020 **Status:** ✅ Merged **Merged:** 10/26/2020 **Merged by:** [@marcelklehr](https://github.com/marcelklehr) **Base:** `develop` ← **Head:** `fix/unidir-merge` --- ### 📝 Commits (2) - [`f315527`](https://github.com/floccusaddon/floccus/commit/f31552738b9c8068506848ec1d8bf75a119e3b29) Sync: Fix unidirectional strategies when no cache is available - [`6aaae95`](https://github.com/floccusaddon/floccus/commit/6aaae95e3c736176290ee011d1424ede9c55923c) Sync: Detect moves of bookmarks even when ID changed ### 📊 Changes **11 files changed** (+259 additions, -50 deletions) <details> <summary>View changed files</summary> 📝 `package-lock.json` (+3 -3) 📝 `package.json` (+1 -1) 📝 `src/lib/Account.js` (+18 -6) 📝 `src/lib/Diff.ts` (+29 -18) 📝 `src/lib/Scanner.ts` (+6 -5) 📝 `src/lib/adapters/NextcloudFolders.ts` (+1 -1) 📝 `src/lib/strategies/Merge.ts` (+1 -1) 📝 `src/lib/strategies/Overwrite.ts` (+2 -6) ➕ `src/lib/strategies/OverwriteMerge.ts` (+101 -0) 📝 `src/lib/strategies/Slave.ts` (+14 -9) ➕ `src/lib/strategies/SlaveMerge.ts` (+83 -0) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

kerem

2026-02-25 23:30:37 +03:00

closed this issue
added the
pull-request
label

kerem referenced this issue

2026-02-25 23:31:15 +03:00

[PR #1719] [MERGED] test: Try removing and recreating a bookmark #1923

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

starred/floccus#1719

No description provided.

Rows
Columns