git branchをmergeする

Git で一人で作業してる時には、pull request はあんまり恩恵がなかった。 やはり、branch がべんりということで覚書。

branch 作業したあと内容を反映してPushする時はこうする。

$ git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
rpai-50:201709book massekiy$ git status
On branch master
Your branch is up to date with 'origin/master'.
 
$ git merge issue14

Merge made by the 'recursive' strategy.
 xxxxx |   5 +--
 xxxxxx               | 129 ++++++++++++++++-----------------------------------------------------
 xxxxxx                      | 134 ++++++++++++++++--------------------------------------------------------
 xxxxxx                     | Bin 1730277 -> 1700916 bytes
 4 files changed, 60 insertions(+), 208 deletions(-)

$ git add --all ; git commit -a --allow-empty-message -m "" ; git push origin
On branch master
Your branch is ahead of 'origin/master' by 4 commits.
  (use "git push" to publish your local commits)

nothing to commit, working tree clean
Enumerating objects: 4, done.
Counting objects: 100% (4/4), done.
Delta compression using up to 8 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (2/2), 281 bytes | 281.00 KiB/s, done.
Total 2 (delta 1), reused 0 (delta 0)
remote: Resolving deltas: 100% (1/1), completed with 1 local object.