Add configurable auto-resolution for log conflicts#57
Open
tiagoarroz wants to merge 4 commits into
Open
Conversation
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. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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
.obsidian/github-sync.logbefore showing the conflict resolution UI.Validation
pnpm run buildsuccessfully.