Skip to content

Conversation

mstv
Copy link
Member

@mstv mstv commented Mar 11, 2025

Proposed changes

If there are concurrent changes to the settings file (on disk vs. in app), the last action shall win.
That's why additionally check in FileSettingsCache.NeedRefresh whether the app has newer modifications in memory.

Screenshots

N/A

Test methodology

  • existing tests

Merge strategy

I agree that the maintainer squash merge this PR (if the commit message is clear).


✒️ I contribute this code under The Developer Certificate of Origin.

@mstv mstv self-assigned this Mar 11, 2025
@mstv mstv merged commit 9c1e6e5 into gitextensions:master Mar 12, 2025
4 checks passed
@mstv mstv deleted the fix/filesettingscache branch March 12, 2025 18:14
@mstv mstv added this to the v5.3 milestone Mar 20, 2025
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.

2 participants