B benw Member Jan 21, 2019 30 2 8 39 Mar 26, 2019 #1 error: Your local changes to the following files would be overwritten by merge: app/calls/resources/classes/follow_me.php Please commit your changes or stash them before you merge. Aborting
error: Your local changes to the following files would be overwritten by merge: app/calls/resources/classes/follow_me.php Please commit your changes or stash them before you merge. Aborting
K Kenny Riley Active Member Nov 1, 2017 243 39 28 37 Mar 26, 2019 #2 Advanced > Command Switch to Shell Code: git stash Try updating again. Reactions: benw
C cptnmidnight New Member Apr 27, 2022 5 0 1 49 Jun 7, 2022 #3 So what is the new method since command is no longer available. I tried it from ssh in /var/www/freepbx and I get Code: fatal: unsafe repository ('/var/www/fusionpbx' is owned by someone else) To add an exception for this directory, call:
So what is the new method since command is no longer available. I tried it from ssh in /var/www/freepbx and I get Code: fatal: unsafe repository ('/var/www/fusionpbx' is owned by someone else) To add an exception for this directory, call:
C cptnmidnight New Member Apr 27, 2022 5 0 1 49 Jun 7, 2022 #4 Sorry, I just figured it out Code: sudo -u www-data git stash