deployment fixes

Teslemetry · Jun 17, 2024 · 250e199 · 250e199
1 parent e4cce1f
commit 250e199
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,5 +1,6 @@
 {
-  "displayName": "Teslemetry",
+  "private": "true",
+  "displayName": "Development Branch",
   "name": "homebridge-teslemetry",
   "description": "Connect Homebridge to your Teslemetry account.",
   "version": "0.1.0",

diff --git a/publish.sh b/publish.sh
@@ -6,14 +6,18 @@ npm version minor
 git push
 
 git checkout teslemetry
-git rebase dev -X ours
+git rebase dev
 git push --force-with-lease
+
+git checkout tessie
+git rebase dev
+git push --force-with-lease
+
+git checkout teslemetry
 rm -r dist
 npm publish
 
 git checkout tessie
-git rebase dev  -X ours
-git push --force-with-lease
 rm -r dist
 npm publish