Merge pull request #458 from Shopify/clarifying_diff_message

Clarifying diff message
Shopify · Aug 29, 2017 · ecd5b0e · ecd5b0e
2 parents eaf455f + 1a8e2c2
commit ecd5b0e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/cmd/theme_diff.go b/cmd/theme_diff.go
@@ -32,9 +32,11 @@ Diff:
 		{{- end }}
 {{- end }}
 
-You can solve this by running theme download and merging the remote changes
-using your favourite diff tool or if you are certain about what you are doing
-then use the --force flag
+You can solve this by running 'theme download' to get the most recent copy of these files.
+Running 'theme download' will overwrite any changes you have made so make sure your work is
+commited to your VCS before doing so.
+
+If you are certain that you want to overwrite any changes then use the --force flag
 `))
 
 func newDiff() *themeDiff {

diff --git a/cmd/theme_diff_test.go b/cmd/theme_diff_test.go
@@ -26,9 +26,11 @@ Diff:
 	Removed Files:
 		- testremoved.txt
 
-You can solve this by running theme download and merging the remote changes
-using your favourite diff tool or if you are certain about what you are doing
-then use the --force flag
+You can solve this by running 'theme download' to get the most recent copy of these files.
+Running 'theme download' will overwrite any changes you have made so make sure your work is
+commited to your VCS before doing so.
+
+If you are certain that you want to overwrite any changes then use the --force flag
 `
 	assert.Equal(t, expected, diff.Error())
 }