vslides 1.0.11 → 1.0.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.js +3 -0
- package/package.json +1 -1
package/dist/cli.js
CHANGED
|
@@ -4069,6 +4069,7 @@ async function push(options = {}) {
|
|
|
4069
4069
|
info(`Server has version ${conflict.currentVersion}, you expected version ${cfg.version}.`);
|
|
4070
4070
|
info("Server content saved to: upstream.md");
|
|
4071
4071
|
writeUpstream(conflict.currentMarkdown);
|
|
4072
|
+
updateConfig({ version: conflict.currentVersion });
|
|
4072
4073
|
instructions([
|
|
4073
4074
|
"Compare slides.md (your changes) with upstream.md (server version)",
|
|
4074
4075
|
"Merge both sets of changes into slides.md",
|
|
@@ -4123,6 +4124,7 @@ async function sync() {
|
|
|
4123
4124
|
const serverMarkdown = getResult.data.markdown;
|
|
4124
4125
|
if (localVersion !== void 0 && serverVersion > localVersion) {
|
|
4125
4126
|
writeUpstream(serverMarkdown);
|
|
4127
|
+
updateConfig({ version: serverVersion });
|
|
4126
4128
|
info(`SERVER_UPDATED: Version ${serverVersion} available`);
|
|
4127
4129
|
info("Server content saved to: upstream.md");
|
|
4128
4130
|
instructions([
|
|
@@ -4162,6 +4164,7 @@ async function sync() {
|
|
|
4162
4164
|
info(`Server has version ${conflict.currentVersion}, you expected version ${serverVersion}.`);
|
|
4163
4165
|
info("Server content saved to: upstream.md");
|
|
4164
4166
|
writeUpstream(conflict.currentMarkdown);
|
|
4167
|
+
updateConfig({ version: conflict.currentVersion });
|
|
4165
4168
|
instructions([
|
|
4166
4169
|
"Compare slides.md (your changes) with upstream.md (server version)",
|
|
4167
4170
|
"Merge both sets of changes into slides.md",
|