Repository navigation
fix(log): name the file when a conflict starts or stops waiting - #31
Merged
Merged
Conversation
A conflict left for the user keeps its folders re-listed on every poll so it is not lost, and on the desktop that showed up as the same "changed_paths=8 actions=1" line every 5 minutes with nothing saying which file it was for. Finding it meant comparing the state database against the disk. The log now gets one line when a conflict starts waiting, with its path and kind, and one when it stops, whether the user resolved it in Status or it settled on its own. Deck d1150.
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.
A conflict waiting for the user keeps its folders re-listed every poll, and the log only showed the repeating pass, never which file it was for. The log now gets one line with the path when a conflict starts waiting and one when it stops.