{"id":62068,"date":"2018-12-12T11:00:26","date_gmt":"2018-12-12T09:00:26","guid":{"rendered":"http:\/\/examples.javacodegeeks.com\/?p=62068"},"modified":"2019-04-23T14:13:28","modified_gmt":"2019-04-23T11:13:28","slug":"git-abort-merge-example","status":"publish","type":"post","link":"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/","title":{"rendered":"Git Abort Merge Example"},"content":{"rendered":"<p>In this post, we present a Git Abort Merge Example.<\/p>\n<h2>1. Introduction<\/h2>\n<p>Merging branches is an important operation when working with Version Control Systems (VCSs). One feature that makes Git standout among other VCSs is its branching mechanism. The mechanism used by Git to create and manage branches is both lightweight and efficient in comparison to other VCSs. Because branching and merging are very fast in Git, it is recommended that you merge your branches often.<\/p>\n<p>It is not uncommon to find that a branch has diverged too much from the mainline. When this happens, conflicts can occur while attempting to merge the branch back into the master branch (the default name for the main branch). When this happens, you have two options:<\/p>\n<ul>\n<li>You can resolve the conflicts and resume the merge process with the &#8220;continue&#8221; option.<\/li>\n<li>You can cancel the merge process and try to restore the branches to their pre-merge state with the &#8220;abort&#8221; option.<\/li>\n<\/ul>\n<p>In this article, we will demonstrate how to use the merge abort command if we have merge conflicts.<\/p>\n<p><strong>Warning:<\/strong> It is strongly recommended that you commit any changes before attempting to merge branches. Failure to do so may result in lost changes if you use the merge command with the \u201cabort\u201d option.<\/p>\n<h3>1.1 Tools Used in this Example<\/h3>\n<ul>\n<li>Git 2.17<\/li>\n<\/ul>\n<p>Git downloads are available here: <a href=\"https:\/\/git-scm.com\/downloads\" target=\"_blank\" rel=\"noopener noreferrer\">https:\/\/git-scm.com\/downloads<\/a>.\n<\/p>\n<h2>2. Git Abort Merge Example<\/h2>\n<p>In this example, we will make changes to the same file in two different branches and use the Git merge operation to attempt to merge the branches. We will then cancel the merge operation using the abort option.<\/p>\n<h3>2.1 Download and Extract the Sample Project<\/h3>\n<p>First, download the &#8220;Merge Abort Example&#8221; archive from the <a href=\"#download\">Download<\/a> section and extract it in an empty directory of your choice.<\/p>\n<h3>2.2 Compare the Branches using Git diff<\/h3>\n<p>The sample project has two branches. To list the branches, run the following command in the &#8220;git-abort-example&#8221; directory:<\/p>\n<pre class=\"brush:bash\">$ git branch\n<\/pre>\n<p><span style=\"text-decoration: underline;\"><em>Git branch Command Output<\/em><\/span><\/p>\n<pre class=\"brush:bash\">* master\n  spanish\n<\/pre>\n<p>The * next to master tells us that we are in the master branch. If you are in the &#8220;spanish&#8221; branch, run <code>git checkout master<\/code>.<div style=\"display:inline-block; margin: 15px 0;\"> <div id=\"adngin-JavaCodeGeeks_incontent_video-0\" style=\"display:inline-block;\"><\/div> <\/div><\/p>\n<p>At this point, the &#8220;spanish&#8221; branch and the &#8220;master&#8221; branch are pointing to different commits. You can verify this by running the Git log command.<\/p>\n<pre class=\"brush:bash\">$ git log --oneline --all\n<\/pre>\n<p><span style=\"text-decoration: underline;\"><em>Git log Command Output<\/em><\/span><\/p>\n<pre class=\"brush:bash\">9ae2efa (spanish) Changed greeting\n30dad54 (HEAD -&gt; master) Intial commit of project\n<\/pre>\n<p>Let\u2019s compare the branches. Run the git &#8220;diff&#8221; command:<\/p>\n<pre class=\"brush:bash\">$ git diff spanish\n<\/pre>\n<p><span style=\"text-decoration: underline;\"><em>Git diff Command Output<\/em><\/span><\/p>\n<pre class=\"brush:bash; highlight:[8,9]\">diff --git a\/HelloWorld.java b\/HelloWorld.java\nindex 4d6d395..277a287 100644\n--- a\/HelloWorld.java\n+++ b\/HelloWorld.java\n@@ -1,5 +1,5 @@\n public class HelloWorld {\n        public static void main(String[] args){\n-               System.out.println(\"Hola Mundo!\");\n+               System.out.println(\"Hello World!\");\n        }\n-}\n+}\n<\/pre>\n<p>Hit <code>q<\/code> to quit. On Windows, you may need to hit <code>Control + \\<\/code> to quit.<\/p>\n<p>The output shows that there is a difference in the greeting of HelloWorld.java.<\/p>\n<h3>2.3 Edit HelloWorld.java in the Master Branch and Commit the Change<\/h3>\n<p>While in the &#8220;master&#8221; branch, edit the greeting in <code>HelloWorld.java<\/code> using your favorite text editor.<\/p>\n<p><span style=\"text-decoration: underline;\"><em>HelloWorld.java<\/em><\/span><\/p>\n<pre class=\"brush:java; highlight:[3]; wrap-lines:false\">public class HelloWorld {\n        public static void main(String[] args){\n                System.out.println(\"Bonjur tout le monde!\");\n        }\n}\n<\/pre>\n<p>Next, commit the change with the Git commit command:<\/p>\n<pre class=\"brush:bash\">$ git commit -a -m 'Changed to French greeting'\n<\/pre>\n<p><span style=\"text-decoration: underline;\"><em>Git commit Command Output<\/em><\/span><\/p>\n<pre class=\"brush:bash\">[master cf3b996] Changed to French greeting\n 1 file changed, 2 insertions(+), 2 deletions(-)\n<\/pre>\n<p>Let\u2019s compare the branches again. Run the git &#8220;diff&#8221; command:<\/p>\n<pre class=\"brush:bash\">$ git diff spanish\n<\/pre>\n<p><span style=\"text-decoration: underline;\"><em>Git diff Command Output<\/em><\/span><\/p>\n<pre class=\"brush:bash; highlight:[8,9]\">diff --git a\/HelloWorld.java b\/HelloWorld.java\nindex 4d6d395..277a287 100644\n--- a\/HelloWorld.java\n+++ b\/HelloWorld.java\n@@ -1,5 +1,5 @@\n public class HelloWorld {\n        public static void main(String[] args){\n-               System.out.println(\"Hola Mundo!\");\n+               System.out.println(\"Bonjur tout le monde!\");\n        }\n-}\n+}\n<\/pre>\n<p>Hit <code>q<\/code> to quit. On Windows, you may need to hit Control + \\ to quit.[ulp id=&#8217;pzgfvmZhgslwSymm&#8217;]<\/p>\n<p>The output shows that there is a difference in the greeting of <code>HelloWorld.java<\/code>. Let&#8217;s try to merge the two branches.<\/p>\n<h3>2.4 Merge the Branches<\/h3>\n<p>We would like to merge the &#8220;spanish&#8221; branch into the master branch. While in the master branch, run the following command:<\/p>\n<pre class=\"brush:bash\">$ git merge spanish\n<\/pre>\n<p><span style=\"text-decoration: underline;\"><em>Git merge Command Output<\/em><\/span><\/p>\n<pre class=\"brush:bash\">Auto-merging HelloWorld.java\nCONFLICT (content): Merge conflict in HelloWorld.java\nAutomatic merge failed; fix conflicts and then commit the result.\n<\/pre>\n<p>So what happened? The Git merge command will automatically attempt to incorporate changes from both branches if it can do so cleanly. However, in our situation the changes are in the same area of the file, causing the conflict. You can see this by viewing the file.<\/p>\n<pre class=\"brush:bash\">$ cat HelloWorld.java\n<\/pre>\n<p><span style=\"text-decoration: underline;\"><em>Output<\/em><\/span><\/p>\n<pre class=\"brush:bash\">public class HelloWorld {\n        public static void main(String[] args){\n&lt;&lt;&lt;&lt;&lt;&lt; HEAD\n                System.out.println(\"Bonjur tout le monde!\");\n=======\n                System.out.println(\"Hola Mundo!\");\n&gt;&gt;&gt;&gt;&gt;&gt; spanish\n        }\n}\n<\/pre>\n<p>The Git merge command added markers to help show you where the conflict occurred. The top part (marked with &lt;&lt;&lt;&lt;&lt;&lt; HEAD) shows the file content in the current branch while the bottom part (between ======= and &gt;&gt;&gt;&gt;&gt;&gt; spanish) shows the file content in the &#8220;spanish&#8221; branch.<\/p>\n<p>At this point, you could try to resolve the conflict yourself by running the <code>mergetool<\/code> command (you will need to configure a merge tool in Git) and then complete the merge process with <code>merge --continue<\/code>. (There are other tools at your disposal for resolving conflicts. The topic is beyond the scope of this example.) You can also decide not to continue and cancel the merge with the <code>merge --abort<\/code> command. Let us do the latter. Run the following command:<\/p>\n<pre class=\"brush:bash\">$ git merge --abort\n<\/pre>\n<p>This will back out the merge and reset the repository back to its pre-merged state. (Note that if you have uncommitted changes in your branches, this may not be possible.) You can verify this by viewing the file.<\/p>\n<pre class=\"brush:bash\">$ cat HelloWorld.java\npublic class HelloWorld {\n        public static void main(String[] args){\n                System.out.println(\"Bonjur tout le monde!\");\n        }\n}\n<\/pre>\n<h2>3. Summary<\/h2>\n<p>In this post, we demonstrated how to abort a merge operation in Git when there is a merge conflict.<\/p>\n<h2><a name=\"download\"><\/a>4. Download the Source Code<\/h2>\n<p>That was the Git Abort Merge example.<\/p>\n<div class=\"download\"><strong>Download<\/strong><br \/>\nYou can download the full source code of this example here: <a href=\"http:\/\/examples.javacodegeeks.com\/wp-content\/uploads\/2018\/12\/git-abort-example.zip\"><strong>Merge Abort Example<\/strong><\/a><\/div>\n","protected":false},"excerpt":{"rendered":"<p>In this post, we present a Git Abort Merge Example. 1. Introduction Merging branches is an important operation when working with Version Control Systems (VCSs). One feature that makes Git standout among other VCSs is its branching mechanism. The mechanism used by Git to create and manage branches is both lightweight and efficient in comparison &hellip;<\/p>\n","protected":false},"author":121,"featured_media":27377,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1353],"tags":[1203,1508,1741],"class_list":["post-62068","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-git","tag-git","tag-git-branch","tag-git-merge"],"yoast_head":"<!-- This site is optimized with the Yoast SEO plugin v26.5 - https:\/\/yoast.com\/wordpress\/plugins\/seo\/ -->\n<title>Git Abort Merge Example - Java Code Geeks<\/title>\n<meta name=\"description\" content=\"Interested to learn more about Git? Then check out our detailed example on Git Abort Merge! Download our FREE Git Tutorial!\" \/>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/\" \/>\n<meta property=\"og:locale\" content=\"en_US\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"Git Abort Merge Example - Java Code Geeks\" \/>\n<meta property=\"og:description\" content=\"Interested to learn more about Git? Then check out our detailed example on Git Abort Merge! Download our FREE Git Tutorial!\" \/>\n<meta property=\"og:url\" content=\"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/\" \/>\n<meta property=\"og:site_name\" content=\"Examples Java Code Geeks\" \/>\n<meta property=\"article:publisher\" content=\"https:\/\/www.facebook.com\/javacodegeeks\" \/>\n<meta property=\"article:published_time\" content=\"2018-12-12T09:00:26+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2019-04-23T11:13:28+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/examples.javacodegeeks.com\/wp-content\/uploads\/2015\/09\/git-logo.jpg\" \/>\n\t<meta property=\"og:image:width\" content=\"150\" \/>\n\t<meta property=\"og:image:height\" content=\"150\" \/>\n\t<meta property=\"og:image:type\" content=\"image\/jpeg\" \/>\n<meta name=\"author\" content=\"Gilbert Lopez\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:creator\" content=\"@gillopez_dev\" \/>\n<meta name=\"twitter:site\" content=\"@javacodegeeks\" \/>\n<meta name=\"twitter:label1\" content=\"Written by\" \/>\n\t<meta name=\"twitter:data1\" content=\"Gilbert Lopez\" \/>\n\t<meta name=\"twitter:label2\" content=\"Est. reading time\" \/>\n\t<meta name=\"twitter:data2\" content=\"5 minutes\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"Article\",\"@id\":\"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/#article\",\"isPartOf\":{\"@id\":\"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/\"},\"author\":{\"name\":\"Gilbert Lopez\",\"@id\":\"https:\/\/examples.javacodegeeks.com\/#\/schema\/person\/6169578062b8f6f6a1f79c82aafdb9ce\"},\"headline\":\"Git Abort Merge Example\",\"datePublished\":\"2018-12-12T09:00:26+00:00\",\"dateModified\":\"2019-04-23T11:13:28+00:00\",\"mainEntityOfPage\":{\"@id\":\"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/\"},\"wordCount\":794,\"commentCount\":0,\"publisher\":{\"@id\":\"https:\/\/examples.javacodegeeks.com\/#organization\"},\"image\":{\"@id\":\"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/#primaryimage\"},\"thumbnailUrl\":\"https:\/\/examples.javacodegeeks.com\/wp-content\/uploads\/2015\/09\/git-logo.jpg\",\"keywords\":[\"git\",\"git branch\",\"git merge\"],\"articleSection\":[\"Git\"],\"inLanguage\":\"en-US\",\"potentialAction\":[{\"@type\":\"CommentAction\",\"name\":\"Comment\",\"target\":[\"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/#respond\"]}]},{\"@type\":\"WebPage\",\"@id\":\"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/\",\"url\":\"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/\",\"name\":\"Git Abort Merge Example - Java Code Geeks\",\"isPartOf\":{\"@id\":\"https:\/\/examples.javacodegeeks.com\/#website\"},\"primaryImageOfPage\":{\"@id\":\"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/#primaryimage\"},\"image\":{\"@id\":\"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/#primaryimage\"},\"thumbnailUrl\":\"https:\/\/examples.javacodegeeks.com\/wp-content\/uploads\/2015\/09\/git-logo.jpg\",\"datePublished\":\"2018-12-12T09:00:26+00:00\",\"dateModified\":\"2019-04-23T11:13:28+00:00\",\"description\":\"Interested to learn more about Git? Then check out our detailed example on Git Abort Merge! Download our FREE Git Tutorial!\",\"breadcrumb\":{\"@id\":\"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/#breadcrumb\"},\"inLanguage\":\"en-US\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/\"]}]},{\"@type\":\"ImageObject\",\"inLanguage\":\"en-US\",\"@id\":\"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/#primaryimage\",\"url\":\"https:\/\/examples.javacodegeeks.com\/wp-content\/uploads\/2015\/09\/git-logo.jpg\",\"contentUrl\":\"https:\/\/examples.javacodegeeks.com\/wp-content\/uploads\/2015\/09\/git-logo.jpg\",\"width\":150,\"height\":150},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"Home\",\"item\":\"https:\/\/examples.javacodegeeks.com\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Software Development\",\"item\":\"https:\/\/examples.javacodegeeks.com\/category\/software-development\/\"},{\"@type\":\"ListItem\",\"position\":3,\"name\":\"Git\",\"item\":\"https:\/\/examples.javacodegeeks.com\/category\/software-development\/git\/\"},{\"@type\":\"ListItem\",\"position\":4,\"name\":\"Git Abort Merge Example\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/examples.javacodegeeks.com\/#website\",\"url\":\"https:\/\/examples.javacodegeeks.com\/\",\"name\":\"Java Code Geeks\",\"description\":\"Java Examples and Code Snippets\",\"publisher\":{\"@id\":\"https:\/\/examples.javacodegeeks.com\/#organization\"},\"alternateName\":\"JCG\",\"potentialAction\":[{\"@type\":\"SearchAction\",\"target\":{\"@type\":\"EntryPoint\",\"urlTemplate\":\"https:\/\/examples.javacodegeeks.com\/?s={search_term_string}\"},\"query-input\":{\"@type\":\"PropertyValueSpecification\",\"valueRequired\":true,\"valueName\":\"search_term_string\"}}],\"inLanguage\":\"en-US\"},{\"@type\":\"Organization\",\"@id\":\"https:\/\/examples.javacodegeeks.com\/#organization\",\"name\":\"Exelixis Media P.C.\",\"url\":\"https:\/\/examples.javacodegeeks.com\/\",\"logo\":{\"@type\":\"ImageObject\",\"inLanguage\":\"en-US\",\"@id\":\"https:\/\/examples.javacodegeeks.com\/#\/schema\/logo\/image\/\",\"url\":\"https:\/\/examples.javacodegeeks.com\/wp-content\/uploads\/2022\/06\/exelixis-logo.png\",\"contentUrl\":\"https:\/\/examples.javacodegeeks.com\/wp-content\/uploads\/2022\/06\/exelixis-logo.png\",\"width\":864,\"height\":246,\"caption\":\"Exelixis Media P.C.\"},\"image\":{\"@id\":\"https:\/\/examples.javacodegeeks.com\/#\/schema\/logo\/image\/\"},\"sameAs\":[\"https:\/\/www.facebook.com\/javacodegeeks\",\"https:\/\/x.com\/javacodegeeks\"]},{\"@type\":\"Person\",\"@id\":\"https:\/\/examples.javacodegeeks.com\/#\/schema\/person\/6169578062b8f6f6a1f79c82aafdb9ce\",\"name\":\"Gilbert Lopez\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"en-US\",\"@id\":\"https:\/\/examples.javacodegeeks.com\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/examples.javacodegeeks.com\/wp-content\/uploads\/2017\/04\/Gilbert-Lopez_avatar_1492457226-96x96.jpg\",\"contentUrl\":\"https:\/\/examples.javacodegeeks.com\/wp-content\/uploads\/2017\/04\/Gilbert-Lopez_avatar_1492457226-96x96.jpg\",\"caption\":\"Gilbert Lopez\"},\"description\":\"Gilbert Lopez is an application developer and systems integration developer with experience building business solutions for large and medium-sized companies. He has worked on many Java EE projects. His roles have included lead developer, systems analyst, business analyst and consultant. Gilbert graduated from California State University in Los Angeles with a Bachelor of Science degree in Business.\",\"sameAs\":[\"https:\/\/www.javacodegeeks.com\",\"https:\/\/www.linkedin.com\/in\/gilbertlopezdeveloper\",\"https:\/\/x.com\/gillopez_dev\"],\"url\":\"https:\/\/examples.javacodegeeks.com\/author\/gilbert-lopez\/\"}]}<\/script>\n<!-- \/ Yoast SEO plugin. -->","yoast_head_json":{"title":"Git Abort Merge Example - Java Code Geeks","description":"Interested to learn more about Git? Then check out our detailed example on Git Abort Merge! Download our FREE Git Tutorial!","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:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/","og_locale":"en_US","og_type":"article","og_title":"Git Abort Merge Example - Java Code Geeks","og_description":"Interested to learn more about Git? Then check out our detailed example on Git Abort Merge! Download our FREE Git Tutorial!","og_url":"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/","og_site_name":"Examples Java Code Geeks","article_publisher":"https:\/\/www.facebook.com\/javacodegeeks","article_published_time":"2018-12-12T09:00:26+00:00","article_modified_time":"2019-04-23T11:13:28+00:00","og_image":[{"width":150,"height":150,"url":"https:\/\/examples.javacodegeeks.com\/wp-content\/uploads\/2015\/09\/git-logo.jpg","type":"image\/jpeg"}],"author":"Gilbert Lopez","twitter_card":"summary_large_image","twitter_creator":"@gillopez_dev","twitter_site":"@javacodegeeks","twitter_misc":{"Written by":"Gilbert Lopez","Est. reading time":"5 minutes"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"Article","@id":"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/#article","isPartOf":{"@id":"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/"},"author":{"name":"Gilbert Lopez","@id":"https:\/\/examples.javacodegeeks.com\/#\/schema\/person\/6169578062b8f6f6a1f79c82aafdb9ce"},"headline":"Git Abort Merge Example","datePublished":"2018-12-12T09:00:26+00:00","dateModified":"2019-04-23T11:13:28+00:00","mainEntityOfPage":{"@id":"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/"},"wordCount":794,"commentCount":0,"publisher":{"@id":"https:\/\/examples.javacodegeeks.com\/#organization"},"image":{"@id":"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/#primaryimage"},"thumbnailUrl":"https:\/\/examples.javacodegeeks.com\/wp-content\/uploads\/2015\/09\/git-logo.jpg","keywords":["git","git branch","git merge"],"articleSection":["Git"],"inLanguage":"en-US","potentialAction":[{"@type":"CommentAction","name":"Comment","target":["https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/#respond"]}]},{"@type":"WebPage","@id":"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/","url":"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/","name":"Git Abort Merge Example - Java Code Geeks","isPartOf":{"@id":"https:\/\/examples.javacodegeeks.com\/#website"},"primaryImageOfPage":{"@id":"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/#primaryimage"},"image":{"@id":"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/#primaryimage"},"thumbnailUrl":"https:\/\/examples.javacodegeeks.com\/wp-content\/uploads\/2015\/09\/git-logo.jpg","datePublished":"2018-12-12T09:00:26+00:00","dateModified":"2019-04-23T11:13:28+00:00","description":"Interested to learn more about Git? Then check out our detailed example on Git Abort Merge! Download our FREE Git Tutorial!","breadcrumb":{"@id":"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/#breadcrumb"},"inLanguage":"en-US","potentialAction":[{"@type":"ReadAction","target":["https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/"]}]},{"@type":"ImageObject","inLanguage":"en-US","@id":"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/#primaryimage","url":"https:\/\/examples.javacodegeeks.com\/wp-content\/uploads\/2015\/09\/git-logo.jpg","contentUrl":"https:\/\/examples.javacodegeeks.com\/wp-content\/uploads\/2015\/09\/git-logo.jpg","width":150,"height":150},{"@type":"BreadcrumbList","@id":"https:\/\/examples.javacodegeeks.com\/software-development\/git\/git-abort-merge-example\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"Home","item":"https:\/\/examples.javacodegeeks.com\/"},{"@type":"ListItem","position":2,"name":"Software Development","item":"https:\/\/examples.javacodegeeks.com\/category\/software-development\/"},{"@type":"ListItem","position":3,"name":"Git","item":"https:\/\/examples.javacodegeeks.com\/category\/software-development\/git\/"},{"@type":"ListItem","position":4,"name":"Git Abort Merge Example"}]},{"@type":"WebSite","@id":"https:\/\/examples.javacodegeeks.com\/#website","url":"https:\/\/examples.javacodegeeks.com\/","name":"Java Code Geeks","description":"Java Examples and Code Snippets","publisher":{"@id":"https:\/\/examples.javacodegeeks.com\/#organization"},"alternateName":"JCG","potentialAction":[{"@type":"SearchAction","target":{"@type":"EntryPoint","urlTemplate":"https:\/\/examples.javacodegeeks.com\/?s={search_term_string}"},"query-input":{"@type":"PropertyValueSpecification","valueRequired":true,"valueName":"search_term_string"}}],"inLanguage":"en-US"},{"@type":"Organization","@id":"https:\/\/examples.javacodegeeks.com\/#organization","name":"Exelixis Media P.C.","url":"https:\/\/examples.javacodegeeks.com\/","logo":{"@type":"ImageObject","inLanguage":"en-US","@id":"https:\/\/examples.javacodegeeks.com\/#\/schema\/logo\/image\/","url":"https:\/\/examples.javacodegeeks.com\/wp-content\/uploads\/2022\/06\/exelixis-logo.png","contentUrl":"https:\/\/examples.javacodegeeks.com\/wp-content\/uploads\/2022\/06\/exelixis-logo.png","width":864,"height":246,"caption":"Exelixis Media P.C."},"image":{"@id":"https:\/\/examples.javacodegeeks.com\/#\/schema\/logo\/image\/"},"sameAs":["https:\/\/www.facebook.com\/javacodegeeks","https:\/\/x.com\/javacodegeeks"]},{"@type":"Person","@id":"https:\/\/examples.javacodegeeks.com\/#\/schema\/person\/6169578062b8f6f6a1f79c82aafdb9ce","name":"Gilbert Lopez","image":{"@type":"ImageObject","inLanguage":"en-US","@id":"https:\/\/examples.javacodegeeks.com\/#\/schema\/person\/image\/","url":"https:\/\/examples.javacodegeeks.com\/wp-content\/uploads\/2017\/04\/Gilbert-Lopez_avatar_1492457226-96x96.jpg","contentUrl":"https:\/\/examples.javacodegeeks.com\/wp-content\/uploads\/2017\/04\/Gilbert-Lopez_avatar_1492457226-96x96.jpg","caption":"Gilbert Lopez"},"description":"Gilbert Lopez is an application developer and systems integration developer with experience building business solutions for large and medium-sized companies. He has worked on many Java EE projects. His roles have included lead developer, systems analyst, business analyst and consultant. Gilbert graduated from California State University in Los Angeles with a Bachelor of Science degree in Business.","sameAs":["https:\/\/www.javacodegeeks.com","https:\/\/www.linkedin.com\/in\/gilbertlopezdeveloper","https:\/\/x.com\/gillopez_dev"],"url":"https:\/\/examples.javacodegeeks.com\/author\/gilbert-lopez\/"}]}},"_links":{"self":[{"href":"https:\/\/examples.javacodegeeks.com\/wp-json\/wp\/v2\/posts\/62068","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/examples.javacodegeeks.com\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/examples.javacodegeeks.com\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/examples.javacodegeeks.com\/wp-json\/wp\/v2\/users\/121"}],"replies":[{"embeddable":true,"href":"https:\/\/examples.javacodegeeks.com\/wp-json\/wp\/v2\/comments?post=62068"}],"version-history":[{"count":0,"href":"https:\/\/examples.javacodegeeks.com\/wp-json\/wp\/v2\/posts\/62068\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/examples.javacodegeeks.com\/wp-json\/wp\/v2\/media\/27377"}],"wp:attachment":[{"href":"https:\/\/examples.javacodegeeks.com\/wp-json\/wp\/v2\/media?parent=62068"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/examples.javacodegeeks.com\/wp-json\/wp\/v2\/categories?post=62068"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/examples.javacodegeeks.com\/wp-json\/wp\/v2\/tags?post=62068"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}