{"id":1023,"date":"2016-08-16T12:28:17","date_gmt":"2016-08-16T12:28:17","guid":{"rendered":"https:\/\/fir3netwp.gmsrrpobkbd.com\/2016\/08\/16\/how-to-resolve-a-merge-conflict-from-the-command-line\/"},"modified":"2021-07-31T10:54:55","modified_gmt":"2021-07-31T10:54:55","slug":"how-to-resolve-a-merge-conflict-from-the-command-line","status":"publish","type":"post","link":"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html","title":{"rendered":"How to Resolve a Git Merge Conflict from the Command Line"},"content":{"rendered":"<p>Git provides 3 types of merging, Fast-Forward, Automatic and Manual. A manual merge is required when git is unable to resolve any conflicts , this results in a merge conflict.<br \/>\nWithin this example we will generate a merge conflict and then manually resolve from within the command line.<\/p>\n<div id=\"ez-toc-container\" class=\"ez-toc-v2_0_65 counter-hierarchy ez-toc-counter ez-toc-grey ez-toc-container-direction\">\n<p class=\"ez-toc-title\">Table of Contents<\/p>\n<label for=\"ez-toc-cssicon-toggle-item-662db533574d4\" class=\"ez-toc-cssicon-toggle-label\"><span class=\"\"><span class=\"eztoc-hide\" style=\"display:none;\">Toggle<\/span><span class=\"ez-toc-icon-toggle-span\"><svg style=\"fill: #999;color:#999\" xmlns=\"http:\/\/www.w3.org\/2000\/svg\" class=\"list-377408\" width=\"20px\" height=\"20px\" viewBox=\"0 0 24 24\" fill=\"none\"><path d=\"M6 6H4v2h2V6zm14 0H8v2h12V6zM4 11h2v2H4v-2zm16 0H8v2h12v-2zM4 16h2v2H4v-2zm16 0H8v2h12v-2z\" fill=\"currentColor\"><\/path><\/svg><svg style=\"fill: #999;color:#999\" class=\"arrow-unsorted-368013\" xmlns=\"http:\/\/www.w3.org\/2000\/svg\" width=\"10px\" height=\"10px\" viewBox=\"0 0 24 24\" version=\"1.2\" baseProfile=\"tiny\"><path d=\"M18.2 9.3l-6.2-6.3-6.2 6.3c-.2.2-.3.4-.3.7s.1.5.3.7c.2.2.4.3.7.3h11c.3 0 .5-.1.7-.3.2-.2.3-.5.3-.7s-.1-.5-.3-.7zM5.8 14.7l6.2 6.3 6.2-6.3c.2-.2.3-.5.3-.7s-.1-.5-.3-.7c-.2-.2-.4-.3-.7-.3h-11c-.3 0-.5.1-.7.3-.2.2-.3.5-.3.7s.1.5.3.7z\"\/><\/svg><\/span><\/span><\/label><input type=\"checkbox\"  id=\"ez-toc-cssicon-toggle-item-662db533574d4\"  aria-label=\"Toggle\" \/><nav><ul class='ez-toc-list ez-toc-list-level-1 ' ><li class='ez-toc-page-1 ez-toc-heading-level-2'><a class=\"ez-toc-link ez-toc-heading-1\" href=\"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html\/#File\" title=\"File\">File<\/a><\/li><li class='ez-toc-page-1 ez-toc-heading-level-2'><a class=\"ez-toc-link ez-toc-heading-2\" href=\"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html\/#New_BranchAmend_File\" title=\"New Branch\/Amend File\">New Branch\/Amend File<\/a><\/li><li class='ez-toc-page-1 ez-toc-heading-level-2'><a class=\"ez-toc-link ez-toc-heading-3\" href=\"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html\/#Master_BranchAmend_File\" title=\"Master Branch\/Amend File\">Master Branch\/Amend File<\/a><\/li><li class='ez-toc-page-1 ez-toc-heading-level-2'><a class=\"ez-toc-link ez-toc-heading-4\" href=\"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html\/#Merge\" title=\"Merge\">Merge<\/a><\/li><li class='ez-toc-page-1 ez-toc-heading-level-2'><a class=\"ez-toc-link ez-toc-heading-5\" href=\"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html\/#Resolve_Conflict\" title=\"Resolve Conflict\">Resolve Conflict<\/a><\/li><\/ul><\/nav><\/div>\n<h2><span class=\"ez-toc-section\" id=\"File\"><\/span>File<span class=\"ez-toc-section-end\"><\/span><\/h2>\n<p>First, lets look at the contents of the file will be generate a conflict on.<\/p>\n<pre class=\"prettyprint\">11:44:38-felix001~\/projects\/example (master)$ cat README.md xyz<\/pre>\n<h2><span class=\"ez-toc-section\" id=\"New_BranchAmend_File\"><\/span>New Branch\/Amend File<span class=\"ez-toc-section-end\"><\/span><\/h2>\n<p>Next we create a new branch and update the file.<\/p>\n<pre class=\"prettyprint\">11:44:52-felix001~\/projects\/example (master)$ git checkout -b create-conflict\r\nSwitched to a new branch 'create-conflict'\r\n11:45:24-felix001~\/projects\/example (create-conflict)$ sed -i 's\/xyz\/abc\/g' README.md\r\n11:45:46-felix001~\/projects\/example (create-conflict)$ git commit -am \"bad update\"\r\n[create-conflict f85beb1] bad update\r\n 1 files changed, 1 insertions(+), 1 deletions(-)<\/pre>\n<h2><span class=\"ez-toc-section\" id=\"Master_BranchAmend_File\"><\/span>Master Branch\/Amend File<span class=\"ez-toc-section-end\"><\/span><\/h2>\n<p>We then switch back to the master branch. And change the same line within the file.<\/p>\n<pre class=\"prettyprint\">11:46:15-felix001~\/projects\/example (create-conflict)$ git checkout master\r\nSwitched to branch 'master'\r\n11:46:22-felix001~\/projects\/example (master)$ cat README.md\r\nxyz\r\n11:46:35-felix001~\/projects\/example (master)$ sed -i 's\/xyz\/123\/g' README.md\r\n11:46:49-felix001~\/projects\/example (master)$ cat README.md\r\n123\r\n11:47:03-felix001~\/projects\/example (master)$ git commit -am \"bad update\"\r\n[master 231df4e] bad update\r\n 1 files changed, 1 insertions(+), 1 deletions(-)<\/pre>\n<h2><span class=\"ez-toc-section\" id=\"Merge\"><\/span>Merge<span class=\"ez-toc-section-end\"><\/span><\/h2>\n<p>Now when we try to merge our new branch with master, we will create a merge conflict. Merge conflicts must be resolved before we can continue.<\/p>\n<pre class=\"prettyprint\">11:47:43-felix001~\/projects\/example (master)$ git merge create-conflict\r\nAuto-merging README.md\r\nCONFLICT (content): Merge conflict in README.md\r\nAutomatic merge failed; fix conflicts and then commit the result.\r\n11:48:09-felix001~\/projects\/example (master|MERGING)$ git status\r\n# On branch master\r\n# Unmerged paths:\r\n#   (use \"git add\/rm ...\" as appropriate to mark resolution)\r\n#\r\n#       both modified:      README.md\r\n#\r\nno changes added to commit (use \"git add\" and\/or \"git commit -a\")<\/pre>\n<p>If we now look at the README file you will see the following,<\/p>\n<pre class=\"prettyprint\">&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD\r\nabc\r\n =======\r\n123\r\n &gt;&gt;&gt;&gt;&gt;&gt;&gt; create-conflict<\/pre>\n<h2><span class=\"ez-toc-section\" id=\"Resolve_Conflict\"><\/span>Resolve Conflict<span class=\"ez-toc-section-end\"><\/span><\/h2>\n<p>Edit the file so only contains a single update, i.e so it just reads <span class=\"codeinline\">abc<\/span>. We then commit and the merge conflict is successfully resolved.<\/p>\n<pre class=\"prettyprint\">11:51:30-felix001~\/projects\/example (master|MERGING)$ git commit -am \"resolve\"\r\n[master d5d1c9f] resolve\r\n11:51:42-felix001~\/projects\/example (master)$ git status\r\n# On branch master\r\nnothing to commit (working directory clean)<\/pre>\n<p>Note : To rollback the merge you can run the command\u00a0<span class=\"codeinline\">git merge &#8211;abort<\/span><\/p>\n","protected":false},"excerpt":{"rendered":"<p>Git provides 3 types of merging, Fast-Forward, Automatic and Manual. A manual merge is required when git is unable to resolve any conflicts , this results in a merge conflict. Within this example we will generate a merge conflict and then manually resolve from within the command line. File First, lets look at the contents &#8230; <a title=\"How to Resolve a Git Merge Conflict from the Command Line\" class=\"read-more\" href=\"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html\" aria-label=\"Read more about How to Resolve a Git Merge Conflict from the Command Line\">Read more<\/a><\/p>\n","protected":false},"author":2,"featured_media":1022,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[52],"tags":[],"yoast_head":"<!-- This site is optimized with the Yoast SEO plugin v22.5 - https:\/\/yoast.com\/wordpress\/plugins\/seo\/ -->\n<title>How to Resolve a Git Merge Conflict from the Command Line - Fir3net<\/title>\n<meta name=\"description\" content=\"Git provides 3 types of merging, Fast-Forward, Automatic and Manual. A manual merge is required when git is unable to resolve any conflicts , this results\" \/>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html\" \/>\n<meta property=\"og:locale\" content=\"en_US\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"How to Resolve a Git Merge Conflict from the Command Line - Fir3net\" \/>\n<meta property=\"og:description\" content=\"Git provides 3 types of merging, Fast-Forward, Automatic and Manual. A manual merge is required when git is unable to resolve any conflicts , this results\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html\" \/>\n<meta property=\"og:site_name\" content=\"Fir3net\" \/>\n<meta property=\"article:published_time\" content=\"2016-08-16T12:28:17+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2021-07-31T10:54:55+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/www.fir3net.com\/wp-content\/uploads\/2016\/08\/images_articles_1471398438_icon-2.png\" \/>\n\t<meta property=\"og:image:width\" content=\"310\" \/>\n\t<meta property=\"og:image:height\" content=\"311\" \/>\n\t<meta property=\"og:image:type\" content=\"image\/jpeg\" \/>\n<meta name=\"author\" content=\"Rick Donato\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"Written by\" \/>\n\t<meta name=\"twitter:data1\" content=\"Rick Donato\" \/>\n\t<meta name=\"twitter:label2\" content=\"Est. reading time\" \/>\n\t<meta name=\"twitter:data2\" content=\"2 minutes\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"Article\",\"@id\":\"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html#article\",\"isPartOf\":{\"@id\":\"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html\"},\"author\":{\"name\":\"Rick Donato\",\"@id\":\"https:\/\/www.fir3net.com\/#\/schema\/person\/ab35009601b7687ee1c5310be6038037\"},\"headline\":\"How to Resolve a Git Merge Conflict from the Command Line\",\"datePublished\":\"2016-08-16T12:28:17+00:00\",\"dateModified\":\"2021-07-31T10:54:55+00:00\",\"mainEntityOfPage\":{\"@id\":\"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html\"},\"wordCount\":188,\"publisher\":{\"@id\":\"https:\/\/www.fir3net.com\/#organization\"},\"image\":{\"@id\":\"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html#primaryimage\"},\"thumbnailUrl\":\"https:\/\/www.fir3net.com\/wp-content\/uploads\/2016\/08\/images_articles_1471398438_icon-2.png\",\"articleSection\":[\"Linux\"],\"inLanguage\":\"en-US\"},{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html\",\"url\":\"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html\",\"name\":\"How to Resolve a Git Merge Conflict from the Command Line - Fir3net\",\"isPartOf\":{\"@id\":\"https:\/\/www.fir3net.com\/#website\"},\"primaryImageOfPage\":{\"@id\":\"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html#primaryimage\"},\"image\":{\"@id\":\"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html#primaryimage\"},\"thumbnailUrl\":\"https:\/\/www.fir3net.com\/wp-content\/uploads\/2016\/08\/images_articles_1471398438_icon-2.png\",\"datePublished\":\"2016-08-16T12:28:17+00:00\",\"dateModified\":\"2021-07-31T10:54:55+00:00\",\"description\":\"Git provides 3 types of merging, Fast-Forward, Automatic and Manual. A manual merge is required when git is unable to resolve any conflicts , this results\",\"breadcrumb\":{\"@id\":\"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html#breadcrumb\"},\"inLanguage\":\"en-US\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html\"]}]},{\"@type\":\"ImageObject\",\"inLanguage\":\"en-US\",\"@id\":\"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html#primaryimage\",\"url\":\"https:\/\/www.fir3net.com\/wp-content\/uploads\/2016\/08\/images_articles_1471398438_icon-2.png\",\"contentUrl\":\"https:\/\/www.fir3net.com\/wp-content\/uploads\/2016\/08\/images_articles_1471398438_icon-2.png\",\"width\":310,\"height\":311},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"Home\",\"item\":\"https:\/\/www.fir3net.com\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Operating Systems\",\"item\":\"https:\/\/www.fir3net.com\/os\"},{\"@type\":\"ListItem\",\"position\":3,\"name\":\"Linux\",\"item\":\"https:\/\/www.fir3net.com\/os\/linux\"},{\"@type\":\"ListItem\",\"position\":4,\"name\":\"How to Resolve a Git Merge Conflict from the Command Line\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/www.fir3net.com\/#website\",\"url\":\"https:\/\/www.fir3net.com\/\",\"name\":\"Fir3net\",\"description\":\"Keeping you in the know\",\"publisher\":{\"@id\":\"https:\/\/www.fir3net.com\/#organization\"},\"potentialAction\":[{\"@type\":\"SearchAction\",\"target\":{\"@type\":\"EntryPoint\",\"urlTemplate\":\"https:\/\/www.fir3net.com\/?s={search_term_string}\"},\"query-input\":\"required name=search_term_string\"}],\"inLanguage\":\"en-US\"},{\"@type\":\"Organization\",\"@id\":\"https:\/\/www.fir3net.com\/#organization\",\"name\":\"Fir3net\",\"url\":\"https:\/\/www.fir3net.com\/\",\"logo\":{\"@type\":\"ImageObject\",\"inLanguage\":\"en-US\",\"@id\":\"https:\/\/www.fir3net.com\/#\/schema\/logo\/image\/\",\"url\":\"https:\/\/www.fir3net.com\/wp-content\/uploads\/Fir3net-Background-Logo-compressed.png\",\"contentUrl\":\"https:\/\/www.fir3net.com\/wp-content\/uploads\/Fir3net-Background-Logo-compressed.png\",\"width\":390,\"height\":88,\"caption\":\"Fir3net\"},\"image\":{\"@id\":\"https:\/\/www.fir3net.com\/#\/schema\/logo\/image\/\"}},{\"@type\":\"Person\",\"@id\":\"https:\/\/www.fir3net.com\/#\/schema\/person\/ab35009601b7687ee1c5310be6038037\",\"name\":\"Rick Donato\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"en-US\",\"@id\":\"https:\/\/www.fir3net.com\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/d75d69a54c0ca3b32c24c3a9703b623c?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/d75d69a54c0ca3b32c24c3a9703b623c?s=96&d=mm&r=g\",\"caption\":\"Rick Donato\"},\"description\":\"Rick Donato is a Network Automation Architect\/Evangelist and the founder of Packet Coders.\"}]}<\/script>\n<!-- \/ Yoast SEO plugin. -->","yoast_head_json":{"title":"How to Resolve a Git Merge Conflict from the Command Line - Fir3net","description":"Git provides 3 types of merging, Fast-Forward, Automatic and Manual. A manual merge is required when git is unable to resolve any conflicts , this results","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:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html","og_locale":"en_US","og_type":"article","og_title":"How to Resolve a Git Merge Conflict from the Command Line - Fir3net","og_description":"Git provides 3 types of merging, Fast-Forward, Automatic and Manual. A manual merge is required when git is unable to resolve any conflicts , this results","og_url":"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html","og_site_name":"Fir3net","article_published_time":"2016-08-16T12:28:17+00:00","article_modified_time":"2021-07-31T10:54:55+00:00","og_image":[{"width":310,"height":311,"url":"https:\/\/www.fir3net.com\/wp-content\/uploads\/2016\/08\/images_articles_1471398438_icon-2.png","type":"image\/jpeg"}],"author":"Rick Donato","twitter_card":"summary_large_image","twitter_misc":{"Written by":"Rick Donato","Est. reading time":"2 minutes"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"Article","@id":"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html#article","isPartOf":{"@id":"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html"},"author":{"name":"Rick Donato","@id":"https:\/\/www.fir3net.com\/#\/schema\/person\/ab35009601b7687ee1c5310be6038037"},"headline":"How to Resolve a Git Merge Conflict from the Command Line","datePublished":"2016-08-16T12:28:17+00:00","dateModified":"2021-07-31T10:54:55+00:00","mainEntityOfPage":{"@id":"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html"},"wordCount":188,"publisher":{"@id":"https:\/\/www.fir3net.com\/#organization"},"image":{"@id":"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html#primaryimage"},"thumbnailUrl":"https:\/\/www.fir3net.com\/wp-content\/uploads\/2016\/08\/images_articles_1471398438_icon-2.png","articleSection":["Linux"],"inLanguage":"en-US"},{"@type":"WebPage","@id":"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html","url":"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html","name":"How to Resolve a Git Merge Conflict from the Command Line - Fir3net","isPartOf":{"@id":"https:\/\/www.fir3net.com\/#website"},"primaryImageOfPage":{"@id":"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html#primaryimage"},"image":{"@id":"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html#primaryimage"},"thumbnailUrl":"https:\/\/www.fir3net.com\/wp-content\/uploads\/2016\/08\/images_articles_1471398438_icon-2.png","datePublished":"2016-08-16T12:28:17+00:00","dateModified":"2021-07-31T10:54:55+00:00","description":"Git provides 3 types of merging, Fast-Forward, Automatic and Manual. A manual merge is required when git is unable to resolve any conflicts , this results","breadcrumb":{"@id":"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html#breadcrumb"},"inLanguage":"en-US","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html"]}]},{"@type":"ImageObject","inLanguage":"en-US","@id":"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html#primaryimage","url":"https:\/\/www.fir3net.com\/wp-content\/uploads\/2016\/08\/images_articles_1471398438_icon-2.png","contentUrl":"https:\/\/www.fir3net.com\/wp-content\/uploads\/2016\/08\/images_articles_1471398438_icon-2.png","width":310,"height":311},{"@type":"BreadcrumbList","@id":"https:\/\/www.fir3net.com\/UNIX\/Linux\/how-to-resolve-a-merge-conflict-from-the-command-line.html#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"Home","item":"https:\/\/www.fir3net.com\/"},{"@type":"ListItem","position":2,"name":"Operating Systems","item":"https:\/\/www.fir3net.com\/os"},{"@type":"ListItem","position":3,"name":"Linux","item":"https:\/\/www.fir3net.com\/os\/linux"},{"@type":"ListItem","position":4,"name":"How to Resolve a Git Merge Conflict from the Command Line"}]},{"@type":"WebSite","@id":"https:\/\/www.fir3net.com\/#website","url":"https:\/\/www.fir3net.com\/","name":"Fir3net","description":"Keeping you in the know","publisher":{"@id":"https:\/\/www.fir3net.com\/#organization"},"potentialAction":[{"@type":"SearchAction","target":{"@type":"EntryPoint","urlTemplate":"https:\/\/www.fir3net.com\/?s={search_term_string}"},"query-input":"required name=search_term_string"}],"inLanguage":"en-US"},{"@type":"Organization","@id":"https:\/\/www.fir3net.com\/#organization","name":"Fir3net","url":"https:\/\/www.fir3net.com\/","logo":{"@type":"ImageObject","inLanguage":"en-US","@id":"https:\/\/www.fir3net.com\/#\/schema\/logo\/image\/","url":"https:\/\/www.fir3net.com\/wp-content\/uploads\/Fir3net-Background-Logo-compressed.png","contentUrl":"https:\/\/www.fir3net.com\/wp-content\/uploads\/Fir3net-Background-Logo-compressed.png","width":390,"height":88,"caption":"Fir3net"},"image":{"@id":"https:\/\/www.fir3net.com\/#\/schema\/logo\/image\/"}},{"@type":"Person","@id":"https:\/\/www.fir3net.com\/#\/schema\/person\/ab35009601b7687ee1c5310be6038037","name":"Rick Donato","image":{"@type":"ImageObject","inLanguage":"en-US","@id":"https:\/\/www.fir3net.com\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/d75d69a54c0ca3b32c24c3a9703b623c?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/d75d69a54c0ca3b32c24c3a9703b623c?s=96&d=mm&r=g","caption":"Rick Donato"},"description":"Rick Donato is a Network Automation Architect\/Evangelist and the founder of Packet Coders."}]}},"_links":{"self":[{"href":"https:\/\/www.fir3net.com\/wp-json\/wp\/v2\/posts\/1023"}],"collection":[{"href":"https:\/\/www.fir3net.com\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.fir3net.com\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.fir3net.com\/wp-json\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/www.fir3net.com\/wp-json\/wp\/v2\/comments?post=1023"}],"version-history":[{"count":0,"href":"https:\/\/www.fir3net.com\/wp-json\/wp\/v2\/posts\/1023\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/www.fir3net.com\/wp-json\/wp\/v2\/media\/1022"}],"wp:attachment":[{"href":"https:\/\/www.fir3net.com\/wp-json\/wp\/v2\/media?parent=1023"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.fir3net.com\/wp-json\/wp\/v2\/categories?post=1023"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.fir3net.com\/wp-json\/wp\/v2\/tags?post=1023"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}