Skip to content

Add configurable auto-resolution for log conflicts#57

Open
tiagoarroz wants to merge 4 commits into
silvanocerza:mainfrom
tiagoarroz:codex-auto-resolve-log-conflicts
Open

Add configurable auto-resolution for log conflicts#57
tiagoarroz wants to merge 4 commits into
silvanocerza:mainfrom
tiagoarroz:codex-auto-resolve-log-conflicts

Conversation

@tiagoarroz
Copy link
Copy Markdown

@tiagoarroz tiagoarroz commented May 4, 2026

Summary

Automatically resolves sync conflicts in the plugin log file by keeping the local version, with a setting to enable or disable the behavior.

Details

  • Detects conflicts for .obsidian/github-sync.log before showing the conflict resolution UI.
  • Adds a local-content resolution for those log conflicts and uploads that local version as part of the sync.
  • Leaves non-log conflicts in the existing conflict handling flow.
  • Keeps automatic overwrite strategies working on the remaining non-log conflicts.

Validation

  • Ran pnpm run build successfully.

@tiagoarroz tiagoarroz changed the title [codex] Auto-resolve log file conflicts Auto-resolve log file conflicts May 4, 2026
@tiagoarroz tiagoarroz changed the title Auto-resolve log file conflicts Add configurable auto-resolution for log conflicts May 4, 2026
@tiagoarroz
Copy link
Copy Markdown
Author

Hey there. Thanks for the great work in this plugin.

I was running into issues with it as I want logging active but at the same time it was always creating conflicts in the logging files that I would have to resolve to sync.
I decided to add this contribution with an optional automatic conflict handling in the logging files.

@tiagoarroz tiagoarroz marked this pull request as ready for review May 5, 2026 08:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant