Be part of JetBrains PHPverse 2026 on June 9 – a free online event bringing PHP devs worldwide together.

david19's avatar

Gitrebase and Laravel Forge

The problem with gitrebase and forge. On my localhost, all works fine. -> rebase brunch -> clear all conflicts on localhost -> push to github Now the gitrebase works on my localhost, perfect.

But laravel forge allways give me error, after rebase. You have unmerged files!

But i dont have unmerged files on my localhost. I dont know why. I use GitDesktop for my source Controlle.

0 likes
1 reply
MohamedTammam's avatar

In "Self Help" dropdown menu you can try "Reset Git State" and then deploy again. Maybe you have some build files on the production that aren't tracked.

Please or to participate in this conversation.