Skip to content

Commit 0ba9420

Browse files
committed
Change conflict setting default value and disable selection dropdown
1 parent fa995a3 commit 0ba9420

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/settings/settings.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export const DEFAULT_SETTINGS: GitHubSyncSettings = {
2424
syncInterval: 1,
2525
syncOnStartup: false,
2626
syncConfigDir: true,
27-
conflictHandling: "ask",
27+
conflictHandling: "overwrite",
2828
showStatusBarItem: true,
2929
showSyncRibbonButton: true,
3030
enableLogging: true,

src/settings/tab.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@ export default class GitHubSyncSettingsTab extends PluginSettingTab {
182182
this.plugin.settings.conflictHandling = value;
183183
await this.plugin.saveSettings();
184184
});
185-
});
185+
})
186+
.setDisabled(true);
186187

187188
containerEl.createEl("h2", { text: "Interface" });
188189

0 commit comments

Comments
 (0)