{"id":577,"date":"2020-12-24T18:34:21","date_gmt":"2020-12-24T09:34:21","guid":{"rendered":"https:\/\/webclass.jp\/blog\/?p=577"},"modified":"2020-12-25T10:35:32","modified_gmt":"2020-12-25T01:35:32","slug":"phpstorm-%e3%81%ae-update-project-%e6%99%82%e3%81%ab-merge-%e3%81%99%e3%82%8b%e3%81%8b-rebase-%e3%81%99%e3%82%8b%e3%81%8b","status":"publish","type":"post","link":"https:\/\/webclass.jp\/blog\/2020\/12\/24\/phpstorm-%e3%81%ae-update-project-%e6%99%82%e3%81%ab-merge-%e3%81%99%e3%82%8b%e3%81%8b-rebase-%e3%81%99%e3%82%8b%e3%81%8b\/","title":{"rendered":"PhpStorm \u3067 Update Project \u6642\u306b Merge \u3059\u308b\u304b Rebase \u3059\u308b\u304b"},"content":{"rendered":"<p>\u4ee5\u4e0b\u306e\u8aac\u660e\u306f\u3001PhpStorm \u306b\u9650\u3089\u305a\u3001JetBrains \u306e IDE \u306a\u3089\u540c\u69d8\u306e\u306f\u305a\u3067\u3059\u3002<\/p>\n<p>PhpStorm \u3067 Git \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u6271\u3063\u3066\u3044\u308b\u3068\u3001\u30ea\u30e2\u30fc\u30c8\u306e\u5909\u66f4\u3092\u53d6\u5f97\u3059\u308b\u305f\u3081\u306b\u3001Update Project \u30dc\u30bf\u30f3\u3092\u62bc\u3057\u307e\u3059\u3088\u306d\u3002\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u3001<code>Merge incoming changes into the current branch<\/code>  \u3068 <code>Rebase the current branch on top of incoming changes<\/code> \u306e\u3069\u3061\u3089\u304b\u3092\u9078\u629e\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u304c\u3001\u610f\u5473\u3092\u77e5\u3063\u305f\u4e0a\u3067\u9078\u3093\u3067\u3044\u307e\u3059\u304b\uff1f<\/p>\n<p><img decoding=\"async\" src=\"https:\/\/webclass.jp\/blog\/wp-content\/uploads\/2020\/12\/Screen-Shot-2020-12-24-at-16.25.16.png\" alt=\"Update Project\" \/><\/p>\n<p>CLI \u304b\u3089 Git \u3092\u4f7f\u308f\u305a\u3001IDE \u304b\u3089\u306e\u307f Git \u3092\u64cd\u4f5c\u3057\u3066\u3044\u308b\u3068\u3001Rebase \u3092\u77e5\u3089\u306a\u3044\u4eba\u3082\u3044\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002\u305d\u3046\u3044\u3063\u305f\u521d\u5fc3\u8005\u5411\u3051\u306b\u8aac\u660e\u3057\u307e\u3059\u3002<\/p>\n<h2>\u524d\u63d0<\/h2>\n<p>\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u304c\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u72b6\u614b\u306b\u306a\u3063\u3066\u3044\u308b\u3068\u3057\u307e\u3059\u3002<\/p>\n<p><img decoding=\"async\" src=\"https:\/\/webclass.jp\/blog\/wp-content\/uploads\/2020\/12\/Screen-Shot-2020-12-24-at-16.53.55.png\" alt=\"\" \/><\/p>\n<p>\u30ed\u30fc\u30ab\u30eb <code>master<\/code> \u3067\u4e00\u3064\u30b3\u30df\u30c3\u30c8\uff08\u4e00\u756a\u4e0a\uff09\u3057\u305f\u30bf\u30a4\u30df\u30f3\u30b0\u3067\u3059\u3002<code>origin\/master<\/code> \u304b\u3089\u306f\u30b3\u30df\u30c3\u30c8\u4e00\u3064\u5206\u9032\u3093\u3067\u3044\u307e\u3059\u3002<\/p>\n<p>\u5909\u66f4\u3092 Push \u3059\u308b\u524d\u306b\u3001Update Project \u3057\u305f\u3044\u3002\u3057\u304b\u3057\u5b9f\u306f\u3001\u5225\u306e\u958b\u767a\u8005\u304c\u4e00\u3064\u30b3\u30df\u30c3\u30c8\u3092\u30ea\u30e2\u30fc\u30c8\u306b Push \u6e08\u307f\u3060\u3063\u305f\u3068\u3057\u307e\u3059\u3002<\/p>\n<h2>Update Project \u6642\u306b Merge ... \u3092\u9078\u3093\u3060\u5834\u5408<\/h2>\n<p>Update Project \u6642\u306b Merge ... \u3092\u9078\u3093\u3067 OK \u3092\u62bc\u3057\u307e\u3057\u305f\u3002\u30b3\u30df\u30c3\u30c8\u30c4\u30ea\u30fc\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n<p><img decoding=\"async\" src=\"https:\/\/webclass.jp\/blog\/wp-content\/uploads\/2020\/12\/Screen-Shot-2020-12-24-at-16.55.04.png\" alt=\"Merge\" \/><\/p>\n<p>\u5225\u958b\u767a\u8005\u304c\u884c\u3063\u305f\u30ea\u30e2\u30fc\u30c8\u306e\u30b3\u30df\u30c3\u30c8\u304c\u6700\u5f8c\u306b\u30de\u30fc\u30b8\u3055\u308c\u3001\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u304c\u4f5c\u6210\u3055\u308c\u3066\u3044\u307e\u3059\u3002<\/p>\n<h2>Update Project \u6642\u306b Rebase ... \u3092\u9078\u3093\u3060\u5834\u5408<\/h2>\n<p>Update Project \u6642\u306b Rebase ... \u3092\u9078\u3093\u3067 OK \u3092\u62bc\u3057\u307e\u3057\u305f\u3002\u30b3\u30df\u30c3\u30c8\u30c4\u30ea\u30fc\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n<p><img decoding=\"async\" src=\"https:\/\/webclass.jp\/blog\/wp-content\/uploads\/2020\/12\/Screen-Shot-2020-12-24-at-17.00.36.png\" alt=\"Rebase\" \/><\/p>\n<p>\u81ea\u5206\u304c\u6700\u5f8c\u306b\u884c\u3063\u305f\u30b3\u30df\u30c3\u30c8\u304c\u4e00\u756a\u5f8c\u308d\u306b\u4ed8\u3051\u8db3\u3055\u308c\u308b\u5f62\u306b\u306a\u308a\u307e\u3057\u305f\u3002\u3053\u306e\u6642\u3001\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u306f\u4f5c\u6210\u3055\u308c\u307e\u305b\u3093\u3002Rebase \u306e\u65b9\u304c\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u304c\u30b7\u30f3\u30d7\u30eb\u306b\u306a\u308b\u3053\u3068\u304c\u5206\u304b\u308b\u3068\u601d\u3044\u307e\u3059\u3002<\/p>\n<h2>Merge \u3068 Rebase \u3069\u3061\u3089\u3092\u9078\u3076\u304b\uff1f<\/h2>\n<p>\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u306e\u30b7\u30f3\u30d7\u30eb\u3055\u304c\u4fdd\u305f\u308c\u308b\u306e\u306f Rebase \u3067\u3059\u3002\u57fa\u672c\u7684\u306b Rebase \u3092\u9078\u3093\u3067\u3044\u3044\u3068\u601d\u3063\u3066\u3044\u307e\u3059\u3002<\/p>\n<p>\u305f\u3060\u3001\u4e0a\u8a18\u3067\u8aac\u660e\u3057\u305f\u9055\u3044\u306b\u3064\u3044\u3066\u306f\u77e5\u3063\u3066\u304a\u304f\u3079\u304d\u3067\u3059\u3002\u4f55\u304b\u8d77\u3053\u3063\u305f\u6642\u306b\u5bfe\u51e6\u3059\u308b\u306b\u306f\u3001\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u304b\u3089\u904e\u53bb\u3092\u6b63\u78ba\u306b\u77e5\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u307e\u305f\u3001Git \u81ea\u4f53\u306e\u7406\u89e3\u3082\u91cd\u8981\u3067\u3059\u3002\u5168\u3066\u306e Git \u64cd\u4f5c\u3092 PhpStorm \u4e0a\u304b\u3089\u884c\u3046\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002\u7279\u306b\u3053\u306e\u8a18\u4e8b\u306b\u66f8\u3044\u3066\u3042\u308b\u3053\u3068\u3092\u77e5\u3089\u306a\u304b\u3063\u305f\u65b9\u306f <code>git rebase<\/code> \u30b3\u30de\u30f3\u30c9\u306b\u3064\u3044\u3066\u77e5\u3089\u306a\u3044\u3053\u3068\u304c\u591a\u3044\u304b\u3068\u601d\u308f\u308c\u307e\u3059\u3002\u3088\u304f\u4f7f\u3046\u3053\u3068\u306b\u306a\u308b\u306f\u305a\u3067\u3059\u306e\u3067\u3001\u662f\u975e\u8abf\u3079\u3066\u307f\u3066\u304f\u3060\u3055\u3044\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u4ee5\u4e0b\u306e\u8aac\u660e\u306f\u3001PhpStorm \u306b\u9650\u3089\u305a\u3001JetBrains \u306e IDE \u306a\u3089\u540c\u69d8\u306e\u306f\u305a\u3067\u3059\u3002 PhpStorm \u3067 Git \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u6271\u3063\u3066\u3044\u308b\u3068\u3001\u30ea\u30e2\u30fc\u30c8\u306e\u5909\u66f4\u3092\u53d6\u5f97\u3059\u308b\u305f\u3081\u306b\u3001Update Project \u30dc\u30bf [&hellip;]<\/p>\n","protected":false},"author":17,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[5],"tags":[],"class_list":["post-577","post","type-post","status-publish","format-standard","hentry","category-5"],"_links":{"self":[{"href":"https:\/\/webclass.jp\/blog\/wp-json\/wp\/v2\/posts\/577","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/webclass.jp\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/webclass.jp\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/webclass.jp\/blog\/wp-json\/wp\/v2\/users\/17"}],"replies":[{"embeddable":true,"href":"https:\/\/webclass.jp\/blog\/wp-json\/wp\/v2\/comments?post=577"}],"version-history":[{"count":10,"href":"https:\/\/webclass.jp\/blog\/wp-json\/wp\/v2\/posts\/577\/revisions"}],"predecessor-version":[{"id":591,"href":"https:\/\/webclass.jp\/blog\/wp-json\/wp\/v2\/posts\/577\/revisions\/591"}],"wp:attachment":[{"href":"https:\/\/webclass.jp\/blog\/wp-json\/wp\/v2\/media?parent=577"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/webclass.jp\/blog\/wp-json\/wp\/v2\/categories?post=577"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/webclass.jp\/blog\/wp-json\/wp\/v2\/tags?post=577"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}