@vivd-studio/cli 1.9.336 → 1.9.337

package/README.md

@@ -18,8 +18,8 @@ Requires Node.js 20 or newer.
 vivd login
 ```
 
-`vivd login` shows a code and opens Vivd in your browser. Confirm the code there
-and the CLI is signed in to your organization.
+`vivd login` shows a code and opens Vivd in your browser. Confirm the code there,
+pick one or several of your organizations, and the CLI is signed in to them.
 
 ## Connect a website
 
@@ -38,14 +38,21 @@ vivd studio attach &                       # keep Studio open while you work
 git commit -am "Update the opening section" # edit files, then commit
 vivd studio push                           # waits until the change shows in the Vivd tab
 vivd browser screenshot /                  # check the result
-vivd studio pull && git rebase vivd/main   # when Studio has newer commits
+vivd studio pull                           # fetch Studio saves without pushing
 vivd studio save -m "Save edits"           # save edits made in the Vivd tab
 ```
 
+The owner can edit the same website in Studio at the same time. When Studio has
+saved commits the folder lacks, `vivd studio push` merges them into your branch
+first, keeps both histories, and lists what changed, including other-language
+versions of a changed page that still need the same change. It stops only on a
+conflict or on uncommitted changes and prints the next steps. `--no-merge`
+refuses instead. With `--json`, the result carries `merge`.
+
 Publishing, plugin settings and support requests stay in the Vivd tab. The CLI
 tells you when to go there.
 
-Run `vivd help` for every command and `vivd version` for the installed version.
+Run `vivd help` for every command and `vivd --version` for the installed version.
 
 ## Learn more