0

I first ran git checkout <b> and I got "you have unmerged changes", so I ran git diff and I got this:

oleg@xps:~/codes/channelmeter/channelmeter.com$ git diff
diff --git a/package.json b/package.json
index 3eb6bba09..6601bf841 100644
--- a/package.json
+++ b/package.json
@@ -149,6 +149,5 @@
     "webtvasia": "CM_HOST=dashboard.webtvasia.com npm run server",
     "whistle": "CM_HOST=dashboard.whistlesports.com npm run server",
     "zoomin": "CM_HOST=dashboard.zoomin.tv npm run server"
-
   }
 }

it looks like npm changed the package.json file after running npm i, but how do I interpret this diff? What does:

@@ -149,6 +149,5 @@

mean?

  • The `-` in `-149` means the old version, marked by `---` when the file was described. The `149` means "from line 149; the `,6` means "for a span of 6 lines in the old file". The `+` in `+149` means the new version, and the `149` means "from line 149" again, and the `,5` means "for a span of 5 lines in the new file". The actual difference is that the blank line in the old file was deleted in the new file, indicated by the line starting `-`. – Jonathan Leffler Jan 28 '20 at 22:02
  • In case you're wondering what the actual diff is: One blank line was deleted. – mkrieger1 Jan 28 '20 at 22:02

0 Answers0