{"id":1583,"date":"2016-11-29T17:57:00","date_gmt":"2016-11-29T17:57:00","guid":{"rendered":"http:\/\/elbsolutions.com\/projects\/?p=1583"},"modified":"2022-02-03T11:24:32","modified_gmt":"2022-02-03T17:24:32","slug":"git-merge-conflicts-simplified","status":"publish","type":"post","link":"https:\/\/elbsolutions.com\/projects\/git-merge-conflicts-simplified\/","title":{"rendered":"Git – merge conflicts – simplified"},"content":{"rendered":"

Ahh – super easy to understand. I already knew this – but a refresher to say “do what you have been doing” is always reassuring. HOWEVER …. this is a nice website to read and understand for those dicey situations.\u00a0http:\/\/githubtraining.com\/fix-merge-conflict-git-using-sourcetree\/\u00a0<\/a><\/p>\n","protected":false},"excerpt":{"rendered":"

Ahh – super easy to understand. I already knew this – but a refresher to say “do what you have been doing” is always reassuring. HOWEVER …. this is a nice website to read and understand for those dicey situations.\u00a0http:\/\/githubtraining.com\/fix-merge-conflict-git-using-sourcetree\/\u00a0<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-1583","post","type-post","status-publish","format-standard","hentry","category-general"],"yoast_head":"\nGit - merge conflicts - simplified - ELB Solutions.com Inc.<\/title>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/elbsolutions.com\/projects\/git-merge-conflicts-simplified\/\" \/>\n<meta property=\"og:locale\" content=\"en_US\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"Git - merge conflicts - simplified - ELB Solutions.com Inc.\" \/>\n<meta property=\"og:description\" content=\"Ahh – super easy to understand. I already knew this – but a refresher to say “do what you have been doing” is always reassuring. HOWEVER …. this is a nice website to read and understand for those dicey situations.\u00a0http:\/\/githubtraining.com\/fix-merge-conflict-git-using-sourcetree\/\u00a0\" \/>\n<meta property=\"og:url\" content=\"https:\/\/elbsolutions.com\/projects\/git-merge-conflicts-simplified\/\" \/>\n<meta property=\"og:site_name\" content=\"ELB Solutions.com Inc.\" \/>\n<meta property=\"article:published_time\" content=\"2016-11-29T17:57:00+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2022-02-03T17:24:32+00:00\" \/>\n<meta name=\"author\" content=\"Etienne Bley\" \/>\n<meta name=\"twitter:label1\" content=\"Written by\" \/>\n\t<meta name=\"twitter:data1\" content=\"Etienne Bley\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\\\/\\\/schema.org\",\"@graph\":[{\"@type\":\"Article\",\"@id\":\"https:\\\/\\\/elbsolutions.com\\\/projects\\\/git-merge-conflicts-simplified\\\/#article\",\"isPartOf\":{\"@id\":\"https:\\\/\\\/elbsolutions.com\\\/projects\\\/git-merge-conflicts-simplified\\\/\"},\"author\":{\"name\":\"Etienne Bley\",\"@id\":\"https:\\\/\\\/elbsolutions.com\\\/projects\\\/#\\\/schema\\\/person\\\/51e717c68f4f5917c63baf88f0896c39\"},\"headline\":\"Git – merge conflicts – simplified\",\"datePublished\":\"2016-11-29T17:57:00+00:00\",\"dateModified\":\"2022-02-03T17:24:32+00:00\",\"mainEntityOfPage\":{\"@id\":\"https:\\\/\\\/elbsolutions.com\\\/projects\\\/git-merge-conflicts-simplified\\\/\"},\"wordCount\":49,\"articleSection\":[\"General\"],\"inLanguage\":\"en-US\"},{\"@type\":\"WebPage\",\"@id\":\"https:\\\/\\\/elbsolutions.com\\\/projects\\\/git-merge-conflicts-simplified\\\/\",\"url\":\"https:\\\/\\\/elbsolutions.com\\\/projects\\\/git-merge-conflicts-simplified\\\/\",\"name\":\"Git - merge conflicts - simplified - ELB Solutions.com Inc.\",\"isPartOf\":{\"@id\":\"https:\\\/\\\/elbsolutions.com\\\/projects\\\/#website\"},\"datePublished\":\"2016-11-29T17:57:00+00:00\",\"dateModified\":\"2022-02-03T17:24:32+00:00\",\"author\":{\"@id\":\"https:\\\/\\\/elbsolutions.com\\\/projects\\\/#\\\/schema\\\/person\\\/51e717c68f4f5917c63baf88f0896c39\"},\"breadcrumb\":{\"@id\":\"https:\\\/\\\/elbsolutions.com\\\/projects\\\/git-merge-conflicts-simplified\\\/#breadcrumb\"},\"inLanguage\":\"en-US\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\\\/\\\/elbsolutions.com\\\/projects\\\/git-merge-conflicts-simplified\\\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\\\/\\\/elbsolutions.com\\\/projects\\\/git-merge-conflicts-simplified\\\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"Home\",\"item\":\"https:\\\/\\\/elbsolutions.com\\\/projects\\\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Git – merge conflicts – simplified\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\\\/\\\/elbsolutions.com\\\/projects\\\/#website\",\"url\":\"https:\\\/\\\/elbsolutions.com\\\/projects\\\/\",\"name\":\"ELB Solutions.com Inc.\",\"description\":\"Bringing all your IT Pieces together\",\"potentialAction\":[{\"@type\":\"SearchAction\",\"target\":{\"@type\":\"EntryPoint\",\"urlTemplate\":\"https:\\\/\\\/elbsolutions.com\\\/projects\\\/?s={search_term_string}\"},\"query-input\":{\"@type\":\"PropertyValueSpecification\",\"valueRequired\":true,\"valueName\":\"search_term_string\"}}],\"inLanguage\":\"en-US\"},{\"@type\":\"Person\",\"@id\":\"https:\\\/\\\/elbsolutions.com\\\/projects\\\/#\\\/schema\\\/person\\\/51e717c68f4f5917c63baf88f0896c39\",\"name\":\"Etienne Bley\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"en-US\",\"@id\":\"https:\\\/\\\/secure.gravatar.com\\\/avatar\\\/f8971dfb65b25b768415568f83247df4057f15d037137e386928a804e2c997b9?s=96&d=mm&r=g\",\"url\":\"https:\\\/\\\/secure.gravatar.com\\\/avatar\\\/f8971dfb65b25b768415568f83247df4057f15d037137e386928a804e2c997b9?s=96&d=mm&r=g\",\"contentUrl\":\"https:\\\/\\\/secure.gravatar.com\\\/avatar\\\/f8971dfb65b25b768415568f83247df4057f15d037137e386928a804e2c997b9?s=96&d=mm&r=g\",\"caption\":\"Etienne Bley\"},\"url\":\"https:\\\/\\\/elbsolutions.com\\\/projects\\\/author\\\/etienne-bley\\\/\"}]}<\/script>\n<!-- \/ Yoast SEO plugin. -->","yoast_head_json":{"title":"Git - merge conflicts - simplified - ELB Solutions.com Inc.","robots":{"index":"index","follow":"follow","max-snippet":"max-snippet:-1","max-image-preview":"max-image-preview:large","max-video-preview":"max-video-preview:-1"},"canonical":"https:\/\/elbsolutions.com\/projects\/git-merge-conflicts-simplified\/","og_locale":"en_US","og_type":"article","og_title":"Git - merge conflicts - simplified - ELB Solutions.com Inc.","og_description":"Ahh – super easy to understand. I already knew this – but a refresher to say “do what you have been doing” is always reassuring. HOWEVER …. this is a nice website to read and understand for those dicey situations.\u00a0http:\/\/githubtraining.com\/fix-merge-conflict-git-using-sourcetree\/\u00a0","og_url":"https:\/\/elbsolutions.com\/projects\/git-merge-conflicts-simplified\/","og_site_name":"ELB Solutions.com Inc.","article_published_time":"2016-11-29T17:57:00+00:00","article_modified_time":"2022-02-03T17:24:32+00:00","author":"Etienne Bley","twitter_misc":{"Written by":"Etienne Bley"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"Article","@id":"https:\/\/elbsolutions.com\/projects\/git-merge-conflicts-simplified\/#article","isPartOf":{"@id":"https:\/\/elbsolutions.com\/projects\/git-merge-conflicts-simplified\/"},"author":{"name":"Etienne Bley","@id":"https:\/\/elbsolutions.com\/projects\/#\/schema\/person\/51e717c68f4f5917c63baf88f0896c39"},"headline":"Git – merge conflicts – simplified","datePublished":"2016-11-29T17:57:00+00:00","dateModified":"2022-02-03T17:24:32+00:00","mainEntityOfPage":{"@id":"https:\/\/elbsolutions.com\/projects\/git-merge-conflicts-simplified\/"},"wordCount":49,"articleSection":["General"],"inLanguage":"en-US"},{"@type":"WebPage","@id":"https:\/\/elbsolutions.com\/projects\/git-merge-conflicts-simplified\/","url":"https:\/\/elbsolutions.com\/projects\/git-merge-conflicts-simplified\/","name":"Git - merge conflicts - simplified - ELB Solutions.com Inc.","isPartOf":{"@id":"https:\/\/elbsolutions.com\/projects\/#website"},"datePublished":"2016-11-29T17:57:00+00:00","dateModified":"2022-02-03T17:24:32+00:00","author":{"@id":"https:\/\/elbsolutions.com\/projects\/#\/schema\/person\/51e717c68f4f5917c63baf88f0896c39"},"breadcrumb":{"@id":"https:\/\/elbsolutions.com\/projects\/git-merge-conflicts-simplified\/#breadcrumb"},"inLanguage":"en-US","potentialAction":[{"@type":"ReadAction","target":["https:\/\/elbsolutions.com\/projects\/git-merge-conflicts-simplified\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/elbsolutions.com\/projects\/git-merge-conflicts-simplified\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"Home","item":"https:\/\/elbsolutions.com\/projects\/"},{"@type":"ListItem","position":2,"name":"Git – merge conflicts – simplified"}]},{"@type":"WebSite","@id":"https:\/\/elbsolutions.com\/projects\/#website","url":"https:\/\/elbsolutions.com\/projects\/","name":"ELB Solutions.com Inc.","description":"Bringing all your IT Pieces together","potentialAction":[{"@type":"SearchAction","target":{"@type":"EntryPoint","urlTemplate":"https:\/\/elbsolutions.com\/projects\/?s={search_term_string}"},"query-input":{"@type":"PropertyValueSpecification","valueRequired":true,"valueName":"search_term_string"}}],"inLanguage":"en-US"},{"@type":"Person","@id":"https:\/\/elbsolutions.com\/projects\/#\/schema\/person\/51e717c68f4f5917c63baf88f0896c39","name":"Etienne Bley","image":{"@type":"ImageObject","inLanguage":"en-US","@id":"https:\/\/secure.gravatar.com\/avatar\/f8971dfb65b25b768415568f83247df4057f15d037137e386928a804e2c997b9?s=96&d=mm&r=g","url":"https:\/\/secure.gravatar.com\/avatar\/f8971dfb65b25b768415568f83247df4057f15d037137e386928a804e2c997b9?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/f8971dfb65b25b768415568f83247df4057f15d037137e386928a804e2c997b9?s=96&d=mm&r=g","caption":"Etienne Bley"},"url":"https:\/\/elbsolutions.com\/projects\/author\/etienne-bley\/"}]}},"_links":{"self":[{"href":"https:\/\/elbsolutions.com\/projects\/wp-json\/wp\/v2\/posts\/1583","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/elbsolutions.com\/projects\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/elbsolutions.com\/projects\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/elbsolutions.com\/projects\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/elbsolutions.com\/projects\/wp-json\/wp\/v2\/comments?post=1583"}],"version-history":[{"count":1,"href":"https:\/\/elbsolutions.com\/projects\/wp-json\/wp\/v2\/posts\/1583\/revisions"}],"predecessor-version":[{"id":1584,"href":"https:\/\/elbsolutions.com\/projects\/wp-json\/wp\/v2\/posts\/1583\/revisions\/1584"}],"wp:attachment":[{"href":"https:\/\/elbsolutions.com\/projects\/wp-json\/wp\/v2\/media?parent=1583"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/elbsolutions.com\/projects\/wp-json\/wp\/v2\/categories?post=1583"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/elbsolutions.com\/projects\/wp-json\/wp\/v2\/tags?post=1583"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}