{"id":9503,"date":"2018-03-23T10:28:14","date_gmt":"2018-03-23T09:28:14","guid":{"rendered":"http:\/\/www.b.shuttle.de\/hayek\/hayek\/jochen\/wp\/blog-en\/?p=9503"},"modified":"2018-03-23T10:28:14","modified_gmt":"2018-03-23T09:28:14","slug":"git-scm-merge-local-master-branch-with-remote-master-branch","status":"publish","type":"post","link":"https:\/\/wp.jochen.hayek.name\/blog-en\/2018\/03\/23\/git-scm-merge-local-master-branch-with-remote-master-branch\/","title":{"rendered":"Git SCM: merge local master branch with remote master branch"},"content":{"rendered":"<ul>\n<li><a href=\"https:\/\/stackoverflow.com\/questions\/18116198\/merge-local-master-branch-with-remote-master-branch-in-git\">https:\/\/stackoverflow.com\/questions\/18116198\/merge-local-master-branch-with-remote-master-branch-in-git<\/a><\/li>\n<\/ul>\n<p>The &#8220;git pull remote master&#8221; did not work for me, I used &#8220;git pull origin master&#8221; instead (was this right?).<\/p>\n<ul>\n<li><a href=\"https:\/\/stackoverflow.com\/questions\/16560095\/git-pull-origin-master-branch-to-local-master-when-in-local-develop\">https:\/\/stackoverflow.com\/questions\/16560095\/git-pull-origin-master-branch-to-local-master-when-in-local-develop<\/a><\/li>\n<\/ul>\n","protected":false},"excerpt":{"rendered":"<p>https:\/\/stackoverflow.com\/questions\/18116198\/merge-local-master-branch-with-remote-master-branch-in-git The &#8220;git pull remote master&#8221; did not work for me, I used &#8220;git pull origin master&#8221; instead (was this right?). https:\/\/stackoverflow.com\/questions\/16560095\/git-pull-origin-master-branch-to-local-master-when-in-local-develop<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"_crdt_document":"","jetpack_post_was_ever_published":false,"_jetpack_newsletter_access":"","_jetpack_dont_email_post_to_subs":false,"_jetpack_newsletter_tier_id":0,"_jetpack_memberships_contains_paywalled_content":false,"_jetpack_memberships_contains_paid_content":false,"footnotes":"","jetpack_publicize_message":"","jetpack_publicize_feature_enabled":true,"jetpack_social_post_already_shared":true,"jetpack_social_options":{"image_generator_settings":{"template":"highway","default_image_id":0,"font":"","enabled":false},"version":2},"_share_on_mastodon":"0"},"categories":[783],"tags":[],"class_list":["post-9503","post","type-post","status-publish","format-standard","hentry","category-git-scm"],"share_on_mastodon":{"url":"","error":""},"jetpack_publicize_connections":[],"jetpack_featured_media_url":"","jetpack_sharing_enabled":true,"jetpack_shortlink":"https:\/\/wp.me\/paO0kP-2th","jetpack_likes_enabled":true,"amp_enabled":true,"_links":{"self":[{"href":"https:\/\/wp.jochen.hayek.name\/blog-en\/wp-json\/wp\/v2\/posts\/9503","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/wp.jochen.hayek.name\/blog-en\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/wp.jochen.hayek.name\/blog-en\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/wp.jochen.hayek.name\/blog-en\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/wp.jochen.hayek.name\/blog-en\/wp-json\/wp\/v2\/comments?post=9503"}],"version-history":[{"count":0,"href":"https:\/\/wp.jochen.hayek.name\/blog-en\/wp-json\/wp\/v2\/posts\/9503\/revisions"}],"wp:attachment":[{"href":"https:\/\/wp.jochen.hayek.name\/blog-en\/wp-json\/wp\/v2\/media?parent=9503"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/wp.jochen.hayek.name\/blog-en\/wp-json\/wp\/v2\/categories?post=9503"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/wp.jochen.hayek.name\/blog-en\/wp-json\/wp\/v2\/tags?post=9503"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}