분기상merge 후 처리
9258 단어 GithubDesktopRails
분기 후의 문제
팟캐스트에서 LGTM을 받으면 다음에 가자 으쓱으쓱
나는 지점을 만들려고 시도했다.
다만 제작되었음에도 마지의 변경은 반영되지 않았다
풀의 존재를 잊어버렸어요.
원래 원격 데스크톱에서github desktop을 통해push를 하거든요.
그곳에서 합병을 진행하여 마스터를 최신 물건에 반영하다
하지만 이번 제작의 지점은 물론
로컬에서 중요한 것은 반드시 원격 정보를 휴대해야 한다는 것이다.
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
결과적으로 로컬에서 원격 마스터를 가져올 수 있습니다!
Reference
이 문제에 관하여(분기상merge 후 처리), 우리는 이곳에서 더 많은 자료를 발견하고 링크를 클릭하여 보았다
https://qiita.com/yukikurog/items/95ca891e5cf49967e7f4
텍스트를 자유롭게 공유하거나 복사할 수 있습니다.하지만 이 문서의 URL은 참조 URL로 남겨 두십시오.
우수한 개발자 콘텐츠 발견에 전념
(Collection and Share based on the CC Protocol.)
원래 원격 데스크톱에서github desktop을 통해push를 하거든요.
그곳에서 합병을 진행하여 마스터를 최신 물건에 반영하다
하지만 이번 제작의 지점은 물론
로컬에서 중요한 것은 반드시 원격 정보를 휴대해야 한다는 것이다.
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
결과적으로 로컬에서 원격 마스터를 가져올 수 있습니다!
Reference
이 문제에 관하여(분기상merge 후 처리), 우리는 이곳에서 더 많은 자료를 발견하고 링크를 클릭하여 보았다
https://qiita.com/yukikurog/items/95ca891e5cf49967e7f4
텍스트를 자유롭게 공유하거나 복사할 수 있습니다.하지만 이 문서의 URL은 참조 URL로 남겨 두십시오.
우수한 개발자 콘텐츠 발견에 전념
(Collection and Share based on the CC Protocol.)
Book:chat-space YUKI$ git branch -r
origin/Post-function_new
origin/master
origin/message-sending
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
Reference
이 문제에 관하여(분기상merge 후 처리), 우리는 이곳에서 더 많은 자료를 발견하고 링크를 클릭하여 보았다 https://qiita.com/yukikurog/items/95ca891e5cf49967e7f4텍스트를 자유롭게 공유하거나 복사할 수 있습니다.하지만 이 문서의 URL은 참조 URL로 남겨 두십시오.
우수한 개발자 콘텐츠 발견에 전념
(Collection and Share based on the CC Protocol.)
좋은 웹페이지 즐겨찾기
