HEX
HEX
Server: Apache/2.4.29 (Ubuntu)
System: Linux 2amigos-php74 5.4.0-1103-aws #111~18.04.1-Ubuntu SMP Tue May 23 20:04:10 UTC 2023 x86_64
User: squarehillcompany.com (1002)
PHP: 7.4.25
Disabled: pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare,
$ pwd: /var/www/vhosts/app.ett-dev.2amigos.us/logs/
Upload Files
File: /var/www/vhosts/app.ett-dev.2amigos.us/logs/deploy-29-03-2021-11-39-22.log
[29-03-2021 11:39:22]:   === START DEPLOY ===
[29-03-2021 11:39:22]:   *** PULL ORIGIN STEP ***
From gitlab.com:2amigos/emit.to-panel
 * branch            development -> FETCH_HEAD
   5a9a53c..0f30846  development -> origin/development
error: Your local changes to the following files would be overwritten by merge:
	package-lock.json
Please commit your changes or stash them before you merge.
Aborting
Updating 4757483..0f30846
[29-03-2021 11:39:22]:   === DEPLOY NOT COMPLETE, CHECK ABOVE ERRORS ===
@ Telegram