{"id":73,"date":"2025-01-01T05:08:39","date_gmt":"2025-01-01T05:08:39","guid":{"rendered":"https:\/\/techkubo.com\/git\/?p=73"},"modified":"2025-05-23T19:12:59","modified_gmt":"2025-05-23T19:12:59","slug":"git-merge","status":"publish","type":"post","link":"https:\/\/techkubo.com\/git\/git-merge\/","title":{"rendered":"Git merge"},"content":{"rendered":"\n

git merge<\/code> helps you integrate changes from two branches into a single branch. This is essential for combining work done in different branches, allowing you to keep your project up to date and organized.<\/p>\n\n\n\n

Initial Example<\/h2>\n\n\n\n

To merge another branch into your current branch, use:<\/p>\n\n\n\n

$ git merge <branch_name><\/pre><\/div>\n\n\n\n
<\/p>\n\n\n\n
MERGE Options<\/h2>\n\n\n\n
Option<\/th>Description<\/th><\/tr><\/thead>
--commit<\/code><\/td>Perform the merge and commit the result. Overrides --no-commit<\/code>.<\/td><\/tr>
--no-commit<\/code><\/td>Perform the merge and stop before creating a merge commit, allowing inspection and tweaks.<\/td><\/tr>
--edit<\/code>, -e<\/code><\/td>Invoke an editor before committing the merge to edit the auto-generated merge message.<\/td><\/tr>
--no-edit<\/code><\/td>Accept the auto-generated merge message without invoking an editor.<\/td><\/tr>
--cleanup=<mode><\/code><\/td>Determine how the merge message is cleaned up before committing. See git-commit<\/code> for more details.<\/td><\/tr>
--ff<\/code><\/td>Resolve the merge as a fast-forward if possible.<\/td><\/tr>
--no-ff<\/code><\/td>Create a merge commit even if the merge could be resolved as a fast-forward.<\/td><\/tr>
--ff-only<\/code><\/td>Only perform the merge if it can be resolved as a fast-forward.<\/td><\/tr>
--gpg-sign[=<keyid>]<\/code><\/td>GPG-sign the resulting merge commit. Optional keyid<\/code> defaults to the committer identity.<\/td><\/tr>
--no-gpg-sign<\/code><\/td>Do not GPG-sign the resulting merge commit.<\/td><\/tr>
--log[=<n>]<\/code><\/td>Populate the log message with one-line descriptions from the merged commits.<\/td><\/tr>
--no-log<\/code><\/td>Do not list one-line descriptions from the merged commits.<\/td><\/tr>
--signoff<\/code><\/td>Add a Signed-off-by<\/code> trailer by the committer at the end of the commit log message.<\/td><\/tr>
--no-signoff<\/code><\/td>Do not add a Signed-off-by<\/code> trailer.<\/td><\/tr>
--stat<\/code>, -n<\/code><\/td>Show a diffstat at the end of the merge.<\/td><\/tr>
--no-stat<\/code><\/td>Do not show a diffstat at the end of the merge.<\/td><\/tr>
--squash<\/code><\/td>Create a single commit on top of the current branch, as if a real merge happened, without actually committing.<\/td><\/tr>
--no-squash<\/code><\/td>Perform the merge and commit the result. Overrides --squash<\/code>.<\/td><\/tr>
--[no-]verify<\/code><\/td>Bypass the pre-merge and commit-msg hooks when --no-verify<\/code> is given.<\/td><\/tr>
-s <strategy><\/code><\/td>Use the specified merge strategy. Can be supplied multiple times to specify the order of strategies to try.<\/td><\/tr>
-X <option><\/code><\/td>Pass a merge strategy-specific option to the merge strategy.<\/td><\/tr>
--verify-signatures<\/code><\/td>Verify that the tip commit of the side branch being merged is signed with a valid key.<\/td><\/tr>
--no-verify-signatures<\/code><\/td>Do not verify the signatures of the merged commits.<\/td><\/tr>
--summary<\/code>, --no-summary<\/code><\/td>Show or hide a diffstat at the end of the merge. These are deprecated options and will be removed in the future.<\/td><\/tr>
-q<\/code>, --quiet<\/code><\/td>Operate quietly, implies --no-progress<\/code>.<\/td><\/tr>
-v<\/code>, --verbose<\/code><\/td>Be verbose.<\/td><\/tr>
--progress<\/code>, --no-progress<\/code><\/td>Turn progress reporting on or off explicitly.<\/td><\/tr>
--autostash<\/code><\/td>Automatically create a temporary stash entry before the merge and apply it afterwards.<\/td><\/tr>
--no-autostash<\/code><\/td>Do not create a temporary stash entry.<\/td><\/tr>
--allow-unrelated-histories<\/code><\/td>Allow merging histories that do not share a common ancestor.<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n\n
Examples<\/h2>\n\n\n\n
1. Basic Merge<\/h4>\n\n\n\n
To merge the feature<\/code> branch into your main<\/code> branch:<\/p>\n\n\n\n
    \n
  • First, switch to the branch you want to merge into:<\/li>\n<\/ul>\n\n\n\n
    $ git checkout main<\/pre><\/div>\n\n\n\n
      \n
    • Then, run the merge command:<\/li>\n<\/ul>\n\n\n\n
      $ git merge feature<\/pre><\/div>\n\n\n\n
      <\/p>\n\n\n\n
      2. Merge Conflict<\/h4>\n\n\n\n
      If there are conflicting changes, Git will highlight the files with conflicts:<\/p>\n\n\n\n
        \n
      • Check the conflicted files:<\/li>\n<\/ul>\n\n\n\n
        $ git status<\/pre><\/div>\n\n\n\n
          \n
        • Resolve the conflicts by editing the conflicted files:<\/li>\n<\/ul>\n\n\n\n
          $ nano conflicted_file.txt<\/pre><\/div>\n\n\n\n
            \n
          • After resolving the conflicts, add the files to the staging area:<\/li>\n<\/ul>\n\n\n\n
            $ git add conflicted_file.txt<\/pre><\/div>\n\n\n\n
              \n
            • Commit the merge:<\/li>\n<\/ul>\n\n\n\n
              $ git commit -m "Resolved merge conflict"<\/pre><\/div>\n","protected":false},"excerpt":{"rendered":"
              git merge helps you integrate changes from two branches into a single branch. This is essential for combining work done […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"site-sidebar-layout":"default","site-content-layout":"","ast-site-content-layout":"","site-content-style":"default","site-sidebar-style":"default","ast-global-header-display":"","ast-banner-title-visibility":"","ast-main-header-display":"","ast-hfb-above-header-display":"","ast-hfb-below-header-display":"","ast-hfb-mobile-header-display":"","site-post-title":"","ast-breadcrumbs-content":"","ast-featured-img":"","footer-sml-layout":"","theme-transparent-header-meta":"","adv-header-id-meta":"","stick-header-meta":"","header-above-stick-meta":"","header-main-stick-meta":"","header-below-stick-meta":"","astra-migrate-meta-layouts":"default","ast-page-background-enabled":"default","ast-page-background-meta":{"desktop":{"background-color":"var(--ast-global-color-4)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"tablet":{"background-color":"","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"mobile":{"background-color":"","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""}},"ast-content-background-meta":{"desktop":{"background-color":"var(--ast-global-color-5)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"tablet":{"background-color":"var(--ast-global-color-5)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""},"mobile":{"background-color":"var(--ast-global-color-5)","background-image":"","background-repeat":"repeat","background-position":"center center","background-size":"auto","background-attachment":"scroll","background-type":"","background-media":"","overlay-type":"","overlay-color":"","overlay-opacity":"","overlay-gradient":""}},"footnotes":""},"categories":[1],"tags":[],"class_list":["post-73","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\nGit merge - GIT Tutorial<\/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:\/\/techkubo.com\/git\/git-merge\/\" \/>\n<meta property=\"og:locale\" content=\"en_US\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"Git merge - GIT Tutorial\" \/>\n<meta property=\"og:description\" content=\"git merge helps you integrate changes from two branches into a single branch. This is essential for combining work done […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/techkubo.com\/git\/git-merge\/\" \/>\n<meta property=\"og:site_name\" content=\"GIT Tutorial\" \/>\n<meta property=\"article:published_time\" content=\"2025-01-01T05:08:39+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2025-05-23T19:12:59+00:00\" \/>\n<meta name=\"author\" content=\"Manong\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"Written by\" \/>\n\t<meta name=\"twitter:data1\" content=\"Manong\" \/>\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:\/\/techkubo.com\/git\/git-merge\/#article\",\"isPartOf\":{\"@id\":\"https:\/\/techkubo.com\/git\/git-merge\/\"},\"author\":{\"name\":\"Manong\",\"@id\":\"https:\/\/techkubo.com\/git\/#\/schema\/person\/b4fa2f01fa4ff2a4e98276ce47115965\"},\"headline\":\"Git merge\",\"datePublished\":\"2025-01-01T05:08:39+00:00\",\"dateModified\":\"2025-05-23T19:12:59+00:00\",\"mainEntityOfPage\":{\"@id\":\"https:\/\/techkubo.com\/git\/git-merge\/\"},\"wordCount\":436,\"commentCount\":0,\"publisher\":{\"@id\":\"https:\/\/techkubo.com\/git\/#organization\"},\"inLanguage\":\"en-US\",\"potentialAction\":[{\"@type\":\"CommentAction\",\"name\":\"Comment\",\"target\":[\"https:\/\/techkubo.com\/git\/git-merge\/#respond\"]}]},{\"@type\":\"WebPage\",\"@id\":\"https:\/\/techkubo.com\/git\/git-merge\/\",\"url\":\"https:\/\/techkubo.com\/git\/git-merge\/\",\"name\":\"Git merge - GIT Tutorial\",\"isPartOf\":{\"@id\":\"https:\/\/techkubo.com\/git\/#website\"},\"datePublished\":\"2025-01-01T05:08:39+00:00\",\"dateModified\":\"2025-05-23T19:12:59+00:00\",\"breadcrumb\":{\"@id\":\"https:\/\/techkubo.com\/git\/git-merge\/#breadcrumb\"},\"inLanguage\":\"en-US\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/techkubo.com\/git\/git-merge\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/techkubo.com\/git\/git-merge\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"Home\",\"item\":\"https:\/\/techkubo.com\/git\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Git merge\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/techkubo.com\/git\/#website\",\"url\":\"https:\/\/techkubo.com\/git\/\",\"name\":\"GIT Tutorial\",\"description\":\"\",\"publisher\":{\"@id\":\"https:\/\/techkubo.com\/git\/#organization\"},\"potentialAction\":[{\"@type\":\"SearchAction\",\"target\":{\"@type\":\"EntryPoint\",\"urlTemplate\":\"https:\/\/techkubo.com\/git\/?s={search_term_string}\"},\"query-input\":{\"@type\":\"PropertyValueSpecification\",\"valueRequired\":true,\"valueName\":\"search_term_string\"}}],\"inLanguage\":\"en-US\"},{\"@type\":\"Organization\",\"@id\":\"https:\/\/techkubo.com\/git\/#organization\",\"name\":\"GIT Tutorial\",\"url\":\"https:\/\/techkubo.com\/git\/\",\"logo\":{\"@type\":\"ImageObject\",\"inLanguage\":\"en-US\",\"@id\":\"https:\/\/techkubo.com\/git\/#\/schema\/logo\/image\/\",\"url\":\"https:\/\/techkubo.com\/git\/wp-content\/uploads\/sites\/9\/2025\/01\/cropped-Techkubo-logo-1.png\",\"contentUrl\":\"https:\/\/techkubo.com\/git\/wp-content\/uploads\/sites\/9\/2025\/01\/cropped-Techkubo-logo-1.png\",\"width\":1620,\"height\":1166,\"caption\":\"GIT Tutorial\"},\"image\":{\"@id\":\"https:\/\/techkubo.com\/git\/#\/schema\/logo\/image\/\"}},{\"@type\":\"Person\",\"@id\":\"https:\/\/techkubo.com\/git\/#\/schema\/person\/b4fa2f01fa4ff2a4e98276ce47115965\",\"name\":\"Manong\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"en-US\",\"@id\":\"https:\/\/techkubo.com\/git\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/21a7455736c21887b8fefe0935012d65?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/21a7455736c21887b8fefe0935012d65?s=96&d=mm&r=g\",\"caption\":\"Manong\"},\"sameAs\":[\"https:\/\/techkubo.com\"],\"url\":\"https:\/\/techkubo.com\/git\/author\/manong\/\"}]}<\/script>\n<!-- \/ Yoast SEO plugin. -->","yoast_head_json":{"title":"Git merge - 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:\/\/techkubo.com\/git\/git-merge\/","og_locale":"en_US","og_type":"article","og_title":"Git merge - GIT Tutorial","og_description":"git merge helps you integrate changes from two branches into a single branch. This is essential for combining work done […]","og_url":"https:\/\/techkubo.com\/git\/git-merge\/","og_site_name":"GIT Tutorial","article_published_time":"2025-01-01T05:08:39+00:00","article_modified_time":"2025-05-23T19:12:59+00:00","author":"Manong","twitter_card":"summary_large_image","twitter_misc":{"Written by":"Manong","Est. reading time":"2 minutes"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"Article","@id":"https:\/\/techkubo.com\/git\/git-merge\/#article","isPartOf":{"@id":"https:\/\/techkubo.com\/git\/git-merge\/"},"author":{"name":"Manong","@id":"https:\/\/techkubo.com\/git\/#\/schema\/person\/b4fa2f01fa4ff2a4e98276ce47115965"},"headline":"Git merge","datePublished":"2025-01-01T05:08:39+00:00","dateModified":"2025-05-23T19:12:59+00:00","mainEntityOfPage":{"@id":"https:\/\/techkubo.com\/git\/git-merge\/"},"wordCount":436,"commentCount":0,"publisher":{"@id":"https:\/\/techkubo.com\/git\/#organization"},"inLanguage":"en-US","potentialAction":[{"@type":"CommentAction","name":"Comment","target":["https:\/\/techkubo.com\/git\/git-merge\/#respond"]}]},{"@type":"WebPage","@id":"https:\/\/techkubo.com\/git\/git-merge\/","url":"https:\/\/techkubo.com\/git\/git-merge\/","name":"Git merge - GIT Tutorial","isPartOf":{"@id":"https:\/\/techkubo.com\/git\/#website"},"datePublished":"2025-01-01T05:08:39+00:00","dateModified":"2025-05-23T19:12:59+00:00","breadcrumb":{"@id":"https:\/\/techkubo.com\/git\/git-merge\/#breadcrumb"},"inLanguage":"en-US","potentialAction":[{"@type":"ReadAction","target":["https:\/\/techkubo.com\/git\/git-merge\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/techkubo.com\/git\/git-merge\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"Home","item":"https:\/\/techkubo.com\/git\/"},{"@type":"ListItem","position":2,"name":"Git merge"}]},{"@type":"WebSite","@id":"https:\/\/techkubo.com\/git\/#website","url":"https:\/\/techkubo.com\/git\/","name":"GIT Tutorial","description":"","publisher":{"@id":"https:\/\/techkubo.com\/git\/#organization"},"potentialAction":[{"@type":"SearchAction","target":{"@type":"EntryPoint","urlTemplate":"https:\/\/techkubo.com\/git\/?s={search_term_string}"},"query-input":{"@type":"PropertyValueSpecification","valueRequired":true,"valueName":"search_term_string"}}],"inLanguage":"en-US"},{"@type":"Organization","@id":"https:\/\/techkubo.com\/git\/#organization","name":"GIT Tutorial","url":"https:\/\/techkubo.com\/git\/","logo":{"@type":"ImageObject","inLanguage":"en-US","@id":"https:\/\/techkubo.com\/git\/#\/schema\/logo\/image\/","url":"https:\/\/techkubo.com\/git\/wp-content\/uploads\/sites\/9\/2025\/01\/cropped-Techkubo-logo-1.png","contentUrl":"https:\/\/techkubo.com\/git\/wp-content\/uploads\/sites\/9\/2025\/01\/cropped-Techkubo-logo-1.png","width":1620,"height":1166,"caption":"GIT Tutorial"},"image":{"@id":"https:\/\/techkubo.com\/git\/#\/schema\/logo\/image\/"}},{"@type":"Person","@id":"https:\/\/techkubo.com\/git\/#\/schema\/person\/b4fa2f01fa4ff2a4e98276ce47115965","name":"Manong","image":{"@type":"ImageObject","inLanguage":"en-US","@id":"https:\/\/techkubo.com\/git\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/21a7455736c21887b8fefe0935012d65?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/21a7455736c21887b8fefe0935012d65?s=96&d=mm&r=g","caption":"Manong"},"sameAs":["https:\/\/techkubo.com"],"url":"https:\/\/techkubo.com\/git\/author\/manong\/"}]}},"_links":{"self":[{"href":"https:\/\/techkubo.com\/git\/wp-json\/wp\/v2\/posts\/73"}],"collection":[{"href":"https:\/\/techkubo.com\/git\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/techkubo.com\/git\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/techkubo.com\/git\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/techkubo.com\/git\/wp-json\/wp\/v2\/comments?post=73"}],"version-history":[{"count":2,"href":"https:\/\/techkubo.com\/git\/wp-json\/wp\/v2\/posts\/73\/revisions"}],"predecessor-version":[{"id":171,"href":"https:\/\/techkubo.com\/git\/wp-json\/wp\/v2\/posts\/73\/revisions\/171"}],"wp:attachment":[{"href":"https:\/\/techkubo.com\/git\/wp-json\/wp\/v2\/media?parent=73"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/techkubo.com\/git\/wp-json\/wp\/v2\/categories?post=73"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/techkubo.com\/git\/wp-json\/wp\/v2\/tags?post=73"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}