2020-05-03 laravel

1:

There are errors in the configuration of this machine. Please fix
the following errors and try again:

shell provisioner:
* Shell provisioner `args` must be a string or array.
* Shell provisioner `args` must be a string or array.
* Shell provisioner `args` must be a string or array.
* Shell provisioner `args` must be a string or array.
* Shell provisioner `args` must be a string or array.

运行vagrant时出现以上报错，发现Homestead.yaml文件中

  variables:
    - key: APP_ENV
      value: local

被自己改写成了

variables:
    - keys: APP_ENV
      value: local

也就是说更改参数名会出现这样的报错。

2:出现git报错

 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'https://gitee.com/null_XXXX/weibo.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.

我的history

    88  git init
    89  git commit -m  'Initial commit'
    90  git add .
    91  git commit -m 'Initial commit'
    93  git remote add origin https://gitee.com/null_XXXX/weibo.git
    94  git push -u origin master
    95  ls
    96  git pull origin master --allow-unrelated-histories
    98  git add .
    99  git commit -m "Initial commit"
   100  git pull origin master
   101  git push origin master
   102  ls
   103  history

vagrant@homestead:~$ heroku create
Creating app... !
 ▸    Invalid credentials provided.
heroku: Press any key to open up the browser to login or q to exit:
Opening browser to https://cli-auth.heroku.com/auth/cli/browser/d83f1932-42d6-4fc1-97e5-f472b47e6695
 ›   Warning: Cannot open browser.
heroku: Waiting for login... ⣷

提示无法从cli登陆heroku,前往https://signup.heroku.com注册（无法使用qq邮箱我用的hotmail），然后使用heroku -i登陆

vagrant@homestead:~$ heroku login -i
heroku: Enter your login credentials
Email: xxx@hotmail.com
Password: ************
Logged in as x'x'x@hotmail.com

vagrant@homestead:~/Code/weibo$ heroku create
Creating app... done, ⬢ guarded-oasis-08950
https://guarded-oasis-08950.herokuapp.com/ | https://git.heroku.com/guarded-oasis-08950.git

vagrant@homestead:~/Code/weibo$ echo web: vendor/bin/heroku-php-apache2 public/
vagrant@homestead:~/Code/weibo$ heroku buildpacks:set heroku/php
Buildpack set. Next release on guarded-oasis-08950 will use heroku/php.
Run git push heroku master to create a new release using this buildpack.

vagrant@homestead:~/Code/weibo$ heroku buildpacks:set heroku/php
 ›   Error: Missing required flag:
 ›     -a, --app APP  app to run command against
 ›   See more help with --help