Merges, approval, checks and limits
When two people change one file
Section titled “When two people change one file”ws push is refused when main has commits yours does not have: another builder’s, or the owner’s edits from the panel. Run git pull, then ws push. Merges, markers and conflicts are Git’s own. When both of you changed one file:
- Different lines of one text file: Git merges both changes, with no markers.
- The same lines of a text file: Git keeps both inside the file between
<<<<<<<and>>>>>>>markers. Remove the markers and the lines you do not want, thengit add -A && git commit. The platform refuses a commit that still has a marker, and names the file. - A file that is not text, such as a photo: Git stops and asks you to choose.
git checkout --ours photos/dock.jpgkeeps yours,--theirskeeps the other, thengit addthe file. - One of you deleted a file the other changed: Git stops and asks.
git rm photos/dock.jpgkeeps it deleted,git add photos/dock.jpgkeeps it.
git status lists every file that needs a choice. Owner edits show in git log as commits by Website Strategy, with the owner’s name in the message.
Approval
Section titled “Approval”Bought sites wait for automatic checks before a change goes live. A builder can ask the owner to approve a change, and the site can require approval for all changes.
- One change:
ws push --needs-approvalsends the change to the owner instead of publishing it. The owner gets an email with a link to the change in their account, where they sign in and see a preview of it, with Approve and Not quite buttons. Approving always needs the owner signed in. - A whole site:
ws site --approval requiredmakes each publish, undo and rollback on that bought site wait for the owner. Changes to settings withws sitestill publish without waiting.ws site --approval noneturns it off. Sites start withnone. - A change waiting for approval is not a version.
wsnumbers it, such as A1, keeps it apart, and puts this folder back to the published version, so the next publish from it cannot carry the change.git pullnever brings it into other folders. - Other work goes on. Anyone may publish other changes while one waits. When the owner approves, the platform applies the change to the newest version, as a patch, and publishes the result as a new version. It refuses only if the same field changed since. A field is one field of a data record, one string in a locales file, or one language’s part of a
{% text %}block. A file with no fields, such as an HTML page or a style sheet, counts as one field, so the approval is refused if anyone changed that file since. Then the platform tells the builder, who makes the change again. - Not quite is the owner’s no: it lets the owner point at what should be different, and sends that to the builder as a request.
ws withdraw A1takes the change back into the folder to fix. - Approval applies to sites the business has bought. On a sample, nothing waits.
Automatic checks
Section titled “Automatic checks”Every publish runs these checks on the built pages, in a browser with the site’s own scripts running:
| Check | What passes |
|---|---|
| Speed | Largest Contentful Paint, the time until the biggest image or block of text on the first screen shows, under 2.5 seconds on a slow phone. Lighthouse measures the home page and one page of each layout. |
| Accessibility | axe finds no WCAG 2.2 AA problems. Automated axe checks cover only part of WCAG. |
| Links | Every link inside the site answers. Outside links that fail are warnings. A link to the site’s own domain by its full address is a warning on a sample and stops the publish on a bought site. |
| Forms | The checks send a test entry through each form and look for the saved entry. A form they cannot fill in gets a warning, and the builder checks it by hand. |
| Translations | Nothing is missing in any language. |
| Browser console | No new errors. |
| Screenshots | Taken at 390, 820 and 1440 pixels wide, for people to look at. Nothing passes or fails on them. |
- A sample goes live first, and its checks run in the background.
ws statusshows the newest version’s result. - A bought site goes live only after its checks pass. A failed check stops the publish, and
ws pushnames the problem.
Limits
Section titled “Limits”1,000 built pages, 5,000 files and 500 MB per site; 25 MB per file. Most sites have fewer than 100 pages a builder writes. Pages made with each: and each language’s copy count toward the 1,000. A build that takes longer than 60 seconds stops with the page it was building. One page may take at most 2 seconds to render, its for loops may run at most 100,000 times in all, and its HTML may be at most 5 MB.