Level 15
@HJORTUR17 you need to commit your changes before you push, looks like you have some changes that are not committed.
1 like
Oct 23, 2018
17
Level 14
Unable to deploy to server
Hi, so I'm uploading my files to GitHub and Laravel Forge picks that up and works with it to display my website. But for some reasons, Laravel Forge is Unable to deploy to server, and when I try to git push, it says Already up to date. Does the same when I try to git pull. Can anyone help me with this one?
Here is the error message from the Laravel Forge dashboard:
Tue Oct 23 14:09:56 UTC 2018
From github.com:hjortur17/nfs
* branch master -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
package-lock.json
package.json
public/css/app.css
public/js/app.js
resources/js/bootstrap.js
Please, commit your changes or stash them before you can merge.
Aborting
Updating 90d1692..325c61b
Thanks again!
Level 14
Done that, I do always do:
git add .
git commit -m "message"
git push
Level 14
I get this when I commit:
On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean
Level 15
What do you see when you do git status ? Do you have other branches except master ? Did you change something in other branches ?
1 like
Level 14
This is the reply from git status
On branch master Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
Level 15
Do you have other branches except master ? Did you change something in other branches ?
Level 14
Nope, only one branch
Level 15
Have you run before npm ? Can you run it again npm run watch then check git status ?
Level 14
This what I get:
Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory)
modified: public/css/app.css
modified: public/js/app.js
no changes added to commit (use "git add" and/or "git commit -a")
Level 15
What happens when you add them git add . ?
Level 14
I can upload it, no problem, but still, Laravel Forge says We were unable to deploy to server
Level 15
When you push you will see the same error right ? git push origin ....
Level 14
What do you mean?
Level 15
When you try to push you get again the error above from you question ?
Please, commit your changes or stash them before you can merge. Aborting
Level 14
Yes
Level 15
Okay then you have to try one of those 3:
Level 14
I found a way. I SSH into the server and did git checkout . and it worked.
Please or to participate in this conversation.