Skip to content
Browse files

Forget this merge crap. Just force origin/master

  • Loading branch information...
1 parent 7474cf1 commit 3fc11cf0f9c40661e14c02bf1224a2d19c0aa6fd @indirect committed
Showing with 2 additions and 1 deletion.
  1. +2 −1 Thorfile
View
3 Thorfile
@@ -9,7 +9,8 @@ class Default < Thor
commands = [
"cd /home/arko.net/domains/igooglefight.com/web/igooglefight",
"git clean -f",
- "git pull",
+ "git remote update",
+ "git reset --hard origin/master",
"touch tmp/restart.txt"
]
remote_pull = %{ssh arko "#{commands.join(" && ")}"}

0 comments on commit 3fc11cf

Please sign in to comment.
Something went wrong with that request. Please try again.