[PR]
×
[PR]上記の広告は3ヶ月以上新規記事投稿のないブログに表示されています。新しい記事を書く事で広告が消えます。
[PR]上記の広告は3ヶ月以上新規記事投稿のないブログに表示されています。新しい記事を書く事で広告が消えます。
$year_month = Carbon::parse($year_month, 'UTC');
$hikaku_shitai_date = Carbon::parse($hikaku_shitai_date, 'UTC');
$diff = $year_month->diffInYears($hikaku_shitai_date);
CarbonとはPHPのDateTimeクラスをオーバーラップした日付操作ライブラリです。だそうです。
You asked me to pull without telling me which branch you want to merge with, and 'branch.new_branch.merge' in your configuration file does not tell me, either. Please specify which branch you want to use on the command line and try again (e.g. 'git pull'). See git-pull(1) for details.
$ git fetch $ git checkout -b new_branch $ git pull origin new_branch
$ git branch --set-upstream new_branch origin/new_branch
$ git branch -u origin/new_branchor
$ git branch --set-upstream-to=origin/new_branch
$ git branch -u origin/new_branch new_branchor
$ git branch --set-upstream-to=origin/new_branch new_branch
$ git push -u origin new_branch
$ git checkout -b new_branch origin/new_branch
$ git branch -a * pull_req_no_branch develop master remotes/origin/pull_req_no_branch remotes/origin/develop remotes/origin/master
$ git fetch -p 〜省略〜 123456..78910 develop -> origin/develop x [deleted] (none) -> origin/pull_req_no_branch
$ git branch -a * pull_req_no_branch develop master remotes/origin/develop remotes/origin/masterリモートのpull_req_no_branchが消えた!!
$ git checkout develop
$ git pull
error: The branch 'pull_req_no_branch' is not fully merged.
$ git branch -d pull_req_no_branch Deleted branch pull_req_no_branch (was 1234567).
$ git branch -a * develop master remotes/origin/develop remotes/origin/master