git
thinks that two versions of a .json
file is different, but actually their data is not:
@@ -469,9 +479,9 @@
"integrity": "sha1-+GzWzvT1MAyOY+B6TVEvZfv/RTE=",
"dev": true,
"requires": {
+ "JSONStream": "1.3.1",
"combine-source-map": "0.7.2",
"defined": "1.0.0",
- "JSONStream": "1.3.1",
"through2": "2.0.3",
"umd": "3.0.1"
}
How can we tell git to ignore such differences for JSON files?
Note:
Following code from Tomasz Wegrzanowski's Blog:
echo "*.json diff=json" >> .gitattributes
git config diff.json.textconv json_pp
is not working and causing hangs on git diff