-
Notifications
You must be signed in to change notification settings - Fork 149
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Bug]: CLI always requesting reconciliation strategy for settings_data.json #4715
Comments
Seeing this issue as well. I believe it's caused by line-endings (I'm on windows with CRLF defaults) but wasn't able to change my git settings (or prettier-shopify-liquid) in order to prevent it from happening. Just thinking this because after I reconciliate and choose remote, I have a diff according to git, but when I open the diff nothing shows (this usually happens for line-ending discrepancies between the last commit and current version). Can confirm this by staging the file, and it disappearing because there was no material change after git converts the line-endings to match. |
I'm also seeing this issue on Mac with CLI version 3.74.0. I've tried saving the settings_data.json file with CRLF line endings and the problem persists, so it doesn't seem to be line-ending related. I don't see any diffs in git, the file appears to be exactly the same before and after reconciliation. |
I'm seeing this issue on v3.74.1 as well -- except mine shows me more files have been changed:
However, when I reconcile using the remote version, git shows no changes have occurred in that project. And if I restart the |
Still seeing this on |
Please confirm that you have:
In which of these areas are you experiencing a problem?
Theme
Expected behavior
The CLI should not ask for reconciliation strategy if there is no change between local and remote.
Actual behavior
Every time I run
shopify theme dev --theme-editor-sync --store=store_id
CLI keeps asking for reconciliation strategy for the same file:I tried both with local and remote, in both cases git detects no change. This bug has been around as long as I've started using the new CLI, not just this version. Maybe CLI does a change and revert it back instantaneously, but I can't tell since git don't detect any change whatsoever.
Verbose output
Verbose details
Reproduction steps
shopify theme dev --theme-editor-sync --store=store_id
settings_data.json
fileOperating System
Windows 11 WSL2 (Ubuntu 22.04.3 LTS)
Shopify CLI version (check your project's
package.json
if you're not sure)3.69.0
Shell
bash
Node version (run
node -v
if you're not sure)v20.17.0
What language and version are you using in your application?
No response
The text was updated successfully, but these errors were encountered: