[GH-ISSUE #21] Conflict resolution - Add change history for ssh keys #6

New issue

Open

opened 2026-02-28 01:17:59 +03:00 by kerem · 0 comments

kerem commented

2026-02-28 01:17:59 +03:00

Owner

Originally created by @therealpaulgg on GitHub (Oct 30, 2024).
Original GitHub issue: https://github.com/therealpaulgg/ssh-sync-server/issues/21

Originally assigned to: @Copilot on GitHub.

To assist with resolving merge conflicts and to make syncing a more seamless experience, we should begin tracking changes made to the ssh-sync key database.

For example:

If a key is deleted, and a user then has a 'ssh-sync sync' command run, the system should be able to detect that most recently a key has been deleted, and delete it from the user's local file system. If there have been more recent changes made on a user's system, then they should take priority over what is on the server.

In the event of a conflict, where the server has deleted and the user has modified, we can either choose to:

Do what the server says and replace the file (potential data loss)
Do what the user says and ignore the server, potentially causing old data to be added back
Prompt the user to manually resolve the conflict (similar to a git resolver)

Originally created by @therealpaulgg on GitHub (Oct 30, 2024). Original GitHub issue: https://github.com/therealpaulgg/ssh-sync-server/issues/21 Originally assigned to: @Copilot on GitHub. To assist with resolving merge conflicts and to make syncing a more seamless experience, we should begin tracking changes made to the ssh-sync key database. For example: If a key is deleted, and a user then has a 'ssh-sync sync' command run, the system should be able to detect that most recently a key has been deleted, and delete it from the user's local file system. If there have been more recent changes made on a user's system, then they should take priority over what is on the server. In the event of a conflict, where the server has deleted and the user has modified, we can either choose to: 1. Do what the server says and replace the file (potential data loss) 2. Do what the user says and ignore the server, potentially causing old data to be added back 3. Prompt the user to manually resolve the conflict (similar to a git resolver)

kerem referenced this issue

2026-02-28 01:18:02 +03:00

[PR #6] [MERGED] Get machines #16

No labels

pull-request

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/ssh-sync-server#6

No description provided.

Rows
Columns