We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent d60b268 commit 812e566Copy full SHA for 812e566
src/Files.App/Strings/en-US/Resources.resw
@@ -3133,7 +3133,7 @@
3133
<value>You have uncommitted changes on this branch. What would you like to do with them?</value>
3134
</data>
3135
<data name="MergeInProgress" xml:space="preserve">
3136
- <value>You have an ongoing merge with unresolved conflicts. You must resolve or abort the merge before switching branches.</value>
+ <value>You have an ongoing merge with unresolved conflicts. Please resolve the conflicts or abort the merge to switch branches.</value>
3137
3138
<data name="AbortMergeAndSwitch" xml:space="preserve">
3139
<value>Abort merge and switch to '{0}'</value>
0 commit comments