git pull origin master 　masterブランチにmergeしてからの処理

#masterブランチにmerge後の問題

プルリクエストでLGTMをもらいよっしゃー次行くかで意気揚々と

<img width="797" alt="スクリーンショット 2019-06-13 20.09.15.png" src="https://qiita-image-store.s3.ap-northeast-1.amazonaws.com/0/432050/8fe5ce93-2314-4efc-2fed-a3c5e0db4959.png">


ブランチを作成しようとしました。

<img width="463" alt="スクリーンショット 2019-06-13 20.10.37.png" src="https://qiita-image-store.s3.ap-northeast-1.amazonaws.com/0/432050/6717fff1-e2c2-4b8f-e5f4-f1cb5b0f4e7d.png">


ただ作成をしても、maegeした変更が反映されていないのです、、、、

<img width="413" alt="スクリーンショット 2019-06-13 20.18.31.png" src="https://qiita-image-store.s3.ap-northeast-1.amazonaws.com/0/432050/5f8e706d-7205-0c05-c065-8f4ca8a409be.png">



#pullの存在を忘れてた

そもそもリモートデスクトップにgithub desktopを通じてpushをしている

そこでマージを行いmasterを最新のものに反映させている

しかし、今般作っていくブランチは、もちろん、、

ローカル上、、要はリモートの情報(origin)を持ってこなければいけない。

#git pull origin master　解決！

```
Book:chat-space YUKI$ git branch -r
  origin/Post-function_new
  origin/master
  origin/message-sending
```

リモートの「origin/master」をローカルに反映させるために
git pull origin master　を使用する。

要はプッシュしたものは、プルで引っこ抜かなきゃあかんってことかな？？

```
Book:chat-space YUKI$ git pull origin master
From https://github.com/yukikurog/chat-space2
 * branch            master     -> FETCH_HEAD
Removing config/locales/en.yml
Auto-merging app/views/users/edit.html.haml
Merge made by the 'recursive' strategy.
 .DS_Store                                                    | Bin 0 -> 6148 bytes
 Gemfile                                                      |   5 +-
 Gemfile.lock                                                 |  17 ++++
 app/.DS_Store                                                | Bin 0 -> 6148 bytes
 app/assets/.DS_Store                                         | Bin 0 -> 6148 bytes
 app/assets/javascripts/application.js                        |   2 +
 app/assets/stylesheets/_groups.scss                          | 241 ++++++++++++++++++++++++++++++++++++++++++-------------
 app/assets/stylesheets/application.scss                      |  23 +++++-
 app/assets/stylesheets/config/_colors.scss                   |   9 +++
 app/assets/stylesheets/{ => config}/_reset.scss              |   0
 app/assets/stylesheets/config/_size.scss                     |   0
 app/assets/stylesheets/{ => mixins}/_mixin.scss              |   0
 app/assets/stylesheets/mixins/_vendor_prefix.scss            |   0
 app/assets/stylesheets/modules/_chat.scss                    | 105 ++++++++++++++++++++++++
 app/assets/stylesheets/modules/_flash.scss                   |  13 +++
 app/assets/stylesheets/modules/_group.scss                   | 117 +++++++++++++++++++++++++++
 app/assets/stylesheets/modules/_side_bar.scss                |  46 +++++++++++
 app/assets/stylesheets/modules/_user.scss                    | 141 ++++++++++++++++++++++++++++++++
 app/assets/stylesheets/shared/_side_bar.scss                 |   0
 app/controllers/groups_controller.rb                         |  38 +++++++++
 app/controllers/messages_controller.rb                       |  27 ++++++-
 app/controllers/users_controller.rb                          |   1 +
 app/models/group.rb                                          |  15 ++++
 app/models/group_user.rb                                     |   5 ++
 app/models/message.rb                                        |   7 ++
 app/models/user.rb                                           |   4 +
 app/uploaders/image_uploader.rb                              |  49 +++++++++++
 app/views/devise/confirmations/new.html.erb                  |  16 ++++
 app/views/devise/mailer/confirmation_instructions.html.erb   |   5 ++
 app/views/devise/mailer/email_changed.html.erb               |   7 ++
 app/views/devise/mailer/password_change.html.erb             |   3 +
 app/views/devise/mailer/reset_password_instructions.html.erb |   8 ++
 app/views/devise/mailer/unlock_instructions.html.erb         |   7 ++
 app/views/devise/passwords/edit.html.erb                     |  25 ++++++
 app/views/devise/passwords/new.html.erb                      |  16 ++++
 app/views/devise/registrations/.DS_Store                     | Bin 0 -> 6148 bytes
 app/views/devise/registrations/edit.html.erb                 |  43 ++++++++++
 app/views/devise/registrations/new.html.haml                 |  32 ++++++++
 app/views/devise/sessions/.DS_Store                          | Bin 0 -> 6148 bytes
 app/views/devise/sessions/new.html.haml                      |  21 +++++
 app/views/devise/shared/.DS_Store                            | Bin 0 -> 6148 bytes
 app/views/devise/shared/_error_messages.html.erb             |  15 ++++
 app/views/devise/shared/_links.html.haml                     |   6 ++
 app/views/devise/unlocks/new.html.erb                        |  16 ++++
 app/views/groups/_form.html.haml                             |  42 ++++++++++
 app/views/groups/edit.html.haml                              |  30 +++++++
 app/views/groups/index.html.haml                             |  79 ++++++++++++++++++
 app/views/groups/new.html.haml                               |   3 +
 app/views/layouts/_notifications.html.haml                   |   3 +
 app/views/layouts/application.html.haml                      |   5 +-
 app/views/messages/_message.html.haml                        |  11 +++
 app/views/messages/index.html.haml                           |  83 +++++++------------
 app/views/shared/_side_bar.html.haml                         |  27 +++++++
 app/views/users/edit.html.haml                               |  21 +++++
 chat-space                                                   |   1 +
 config/application.rb                                        |   1 +
 config/devise.ja.yml                                         |  62 ++++++++++++++
 config/locales/devise.en.yml                                 |  91 ++++++++++-----------
 config/locales/en.yml                                        |  23 ------
 config/routes.rb                                             |  16 +++-
 db/migrate/20190530124003_create_groups.rb                   |   9 +++
 db/migrate/20190530124155_create_group_users.rb              |   9 +++
 db/migrate/20190604112805_create_messages.rb                 |  11 +++
 db/schema.rb                                                 |  33 +++++++-
 64 files changed, 1455 insertions(+), 190 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 app/.DS_Store
 create mode 100644 app/assets/.DS_Store
 create mode 100644 app/assets/stylesheets/config/_colors.scss
 rename app/assets/stylesheets/{ => config}/_reset.scss (100%)
 create mode 100644 app/assets/stylesheets/config/_size.scss
 rename app/assets/stylesheets/{ => mixins}/_mixin.scss (100%)
 create mode 100644 app/assets/stylesheets/mixins/_vendor_prefix.scss
 create mode 100644 app/assets/stylesheets/modules/_chat.scss
 create mode 100644 app/assets/stylesheets/modules/_flash.scss
 create mode 100644 app/assets/stylesheets/modules/_group.scss
 create mode 100644 app/assets/stylesheets/modules/_side_bar.scss
 create mode 100644 app/assets/stylesheets/modules/_user.scss
 create mode 100644 app/assets/stylesheets/shared/_side_bar.scss
 create mode 100644 app/controllers/groups_controller.rb
 create mode 100644 app/models/group.rb
 create mode 100644 app/models/group_user.rb
 create mode 100644 app/models/message.rb
 create mode 100644 app/uploaders/image_uploader.rb
 create mode 100644 app/views/devise/confirmations/new.html.erb
 create mode 100644 app/views/devise/mailer/confirmation_instructions.html.erb
 create mode 100644 app/views/devise/mailer/email_changed.html.erb
 create mode 100644 app/views/devise/mailer/password_change.html.erb
 create mode 100644 app/views/devise/mailer/reset_password_instructions.html.erb
 create mode 100644 app/views/devise/mailer/unlock_instructions.html.erb
 create mode 100644 app/views/devise/passwords/edit.html.erb
 create mode 100644 app/views/devise/passwords/new.html.erb
 create mode 100644 app/views/devise/registrations/.DS_Store
 create mode 100644 app/views/devise/registrations/edit.html.erb
 create mode 100644 app/views/devise/registrations/new.html.haml
 create mode 100644 app/views/devise/sessions/.DS_Store
 create mode 100644 app/views/devise/sessions/new.html.haml
 create mode 100644 app/views/devise/shared/.DS_Store
 create mode 100644 app/views/devise/shared/_error_messages.html.erb
 create mode 100644 app/views/devise/shared/_links.html.haml
 create mode 100644 app/views/devise/unlocks/new.html.erb
 create mode 100644 app/views/groups/_form.html.haml
 create mode 100644 app/views/groups/edit.html.haml
 create mode 100644 app/views/groups/index.html.haml
 create mode 100644 app/views/groups/new.html.haml
 create mode 100644 app/views/layouts/_notifications.html.haml
 create mode 100644 app/views/messages/_message.html.haml
 create mode 100644 app/views/shared/_side_bar.html.haml
 create mode 160000 chat-space
 create mode 100755 config/devise.ja.yml
 delete mode 100644 config/locales/en.yml
 create mode 100644 db/migrate/20190530124003_create_groups.rb
 create mode 100644 db/migrate/20190530124155_create_group_users.rb
 create mode 100644 db/migrate/20190604112805_create_messages.rb
```

結果ローカルにリモートのmasterを持ってくることができました！