{"id":3656,"date":"2025-02-11T12:08:14","date_gmt":"2025-02-11T11:08:14","guid":{"rendered":"https:\/\/nguenkam.com\/blog\/?p=3656"},"modified":"2025-02-11T13:30:59","modified_gmt":"2025-02-11T12:30:59","slug":"understanding-git-merge-vs-rebase-a-deep-dive-into-branch-management","status":"publish","type":"post","link":"https:\/\/nguenkam.com\/blog\/index.php\/2025\/02\/11\/understanding-git-merge-vs-rebase-a-deep-dive-into-branch-management\/","title":{"rendered":"Understanding Git Merge vs Rebase: A Deep Dive into Branch Management"},"content":{"rendered":"\n

Git offers different approaches to integrating changes from one branch into another. Two of the most common methods are merge<\/code> and rebase<\/code>. In this article, we’ll explore their differences, use cases, and impact on your development workflow.<\/p>\n\n\n\n

Initial Scenario<\/h4>\n\n\n\n

Let’s start with a common development situation:<\/p>\n\n\n\n

\"\"<\/figure>\n\n\n\n

Where:<\/p>\n\n\n\n

  • A, B, C represent commits on the master branch<\/li>
  • D, E represent commits on the feature branch<\/li><\/ul>\n\n\n\n

    Method 1: Git Merge<\/strong><\/span><\/h4>\n\n\n\n

    When we merge a feature branch into master, Git creates a new commit that combines the histories of both branches.<\/p>\n\n\n\n

    \"\"<\/figure>\n\n\n\n

    Result:<\/span><\/h4>\n\n\n\n
    \"\"<\/figure>\n\n\n\n

    Effects of Merge:<\/h4>\n\n\n\n
    • Creates a new merge commit (M)<\/li>
    • Preserves complete history<\/li>
    • Maintains original timeline<\/li>
    • Easy to revert<\/li>
    • Can lead to a “messy” git graph<\/li><\/ul>\n\n\n\n
      <\/div>\n\n\n\n

      Method 2: Git Rebase<\/strong><\/span><\/h4>\n\n\n\n

      Rebasing rewrites the feature branch history by creating new commits on top of the target branch.<\/p>\n\n\n\n

      \"\"<\/figure>\n\n\n\n

      Result:<\/span><\/h4>\n\n\n\n
      \"\"<\/figure>\n\n\n\n

      Effects of Rebase:<\/h4>\n\n\n\n
      • Rewrites commits D and E (becoming D’ and E’)<\/li>
      • Creates linear history<\/li>
      • Changes original commit timestamps<\/li>
      • Cleaner git graph<\/li>
      • More complex to revert<\/li><\/ul>\n\n\n\n
        <\/div>\n\n\n\n

        Impact on Pipeline and Workflow<\/h4>\n\n\n\n

        Merge Advantages<\/h5>\n\n\n\n
        • ? Safe for public branches<\/li>
        • ? Preserves complete history<\/li>
        • ? No conflicts with other developers<\/li>
        • ? Clear indication of where feature branches were integrated<\/li><\/ul>\n\n\n\n
          Merge Disadvantages<\/h5>\n\n\n\n
          • ? Can lead to a cluttered git graph<\/li>
          • ? Merge commits can “pollute” history<\/li>
          • ? Can make it harder to understand project history<\/li><\/ul>\n\n\n\n
            Rebase Advantages<\/h5>\n\n\n\n
            • ? Clean, linear history<\/li>
            • ? Easier to understand<\/li>
            • ? No additional merge commits<\/li>
            • ? Makes following the project history simpler<\/li><\/ul>\n\n\n\n
              Rebase Disadvantages<\/h5>\n\n\n\n
              • ? Dangerous for public branches<\/li>
              • ? Can cause issues if others have cloned the repository<\/li>
              • ? Conflict resolution can be more complex<\/li>
              • ? Loss of context about when features were integrated<\/li><\/ul>\n\n\n\n
                <\/div>\n\n\n\n

                Best Practices<\/h4>\n\n\n\n

                Use Merge When:<\/h5>\n\n\n\n
                1. Working on a public branch<\/li>
                2. Feature branch history is important<\/li>
                3. Collaborating with multiple developers on the same feature<\/li>
                4. You want to preserve the context of when features were integrated<\/li><\/ol>\n\n\n\n
                  Use Rebase When:<\/h5>\n\n\n\n
                  1. Working on a local, private branch<\/li>
                  2. You prefer a clean, linear history<\/li>
                  3. You want to ensure your feature branch is up-to-date<\/li>
                  4. You’re working alone on a feature<\/li><\/ol>\n\n\n\n
                    <\/div>\n\n\n\n
                    Important Note on Force Push<\/span><\/h5>\n\n\n\n

                    When using rebase on an already pushed branch, we’ll need to force push:<\/p>\n\n\n\n

                    git push --force-with-lease\n<\/code><\/pre>\n\n\n\n
                    ?? Warning<\/strong>: Use force push with caution as it rewrites history for other developers.<\/p>\n\n\n\n
                    <\/div>\n\n\n\n
                    Code Examples in Practice<\/h4>\n\n\n\n
                    Merge Workflow<\/h5>\n\n\n\n
                    # Start feature branch\ngit checkout -b feature\/new-feature master\n\n# Make changes and commit\ngit add .\ngit commit -m \"Add new feature\"\n\n# Later, merge back to master\ngit checkout master\ngit merge feature\/new-feature\n<\/code><\/pre>\n\n\n\n
                    Rebase Workflow<\/h5>\n\n\n\n
                    # Start feature branch\ngit checkout -b feature\/new-feature master\n\n# Make changes and commit\ngit add .\ngit commit -m \"Add new feature\"\n\n# Keep feature branch up to date\ngit checkout feature\/new-feature\ngit rebase master\n\n# When ready to merge\ngit checkout master\ngit merge feature\/new-feature # Will be a fast-forward merge\n<\/code><\/pre>\n\n\n\n
                    <\/div>\n\n\n\n
                    A Practical Example with Real Commit History<\/span><\/h4>\n\n\n\n
                    Let’s look at a concrete example showing exactly what happens during merge and rebase operations.<\/p>\n\n\n\n
                    # On master branch\n$ git log --oneline\n7890abc Fix navbar responsiveness    # C\n456def2 Update user authentication   # B\n123abcd Initial commit              # A\n\n# On feature\/auth branch\n$ git log --oneline\nef98765 Add OAuth integration       # E\ncd45678 Add login form             # D\n456def2 Update user authentication  # B\n123abcd Initial commit             # A\n<\/code><\/pre>\n\n\n\n
                    Visual representation:<\/p>\n\n\n\n
                    \"\"<\/figure>\n\n\n\n
                    Scenario 1: Merge Process<\/span><\/strong><\/h5>\n\n\n\n
                    $ git checkout master\n$ git merge feature\/auth\n<\/code><\/pre>\n\n\n\n
                    Result after merge:<\/h5>\n\n\n\n
                    $ git log --oneline\n9876543 Merge branch 'feature\/auth' into master  # Merge commit (M)\n7890abc Fix navbar responsiveness                # C\nef98765 Add OAuth integration                    # E\ncd45678 Add login form                          # D\n456def2 Update user authentication              # B\n123abcd Initial commit                          # A\n<\/code><\/pre>\n\n\n\n
                    Visual representation:<\/h5>\n\n\n\n
                    \"\"<\/figure>\n\n\n\n
                    Scenario 2: Rebase Process<\/strong><\/span><\/h5>\n\n\n\n
                    $ git checkout feature\/auth\n$ git rebase master\n<\/code><\/pre>\n\n\n\n
                    During rebase:<\/h5>\n\n\n\n
                    # Git internally performs these steps:\n1. Temporarily stores changes from D and E\n2. Moves feature branch pointer to master's HEAD (7890abc)\n3. Replays commits D and E one by one<\/code><\/pre>\n\n\n\n
                    Result after rebase:<\/h5>\n\n\n\n
                    $ git log --oneline\nab12345 Add OAuth integration       # E' (new hash)\nde34567 Add login form             # D' (new hash)\n7890abc Fix navbar responsiveness   # C\n456def2 Update user authentication  # B\n123abcd Initial commit             # A\n<\/code><\/pre>\n\n\n\n
                    Visual representation:<\/h5>\n\n\n\n
                    \"\"<\/figure>\n\n\n\n
                    Detailed Analysis of Changes<\/strong><\/span><\/h5>\n\n\n\n
                    Original Commits (Before Rebase):<\/h5>\n\n\n\n
                    # Commit D details\n$ git show cd45678\ncommit cd45678...\nAuthor: John Doe\nDate:   Mon Feb 10 10:00:00 2025 +0100\n    Add login form\n    \n    - Added login form component\n    - Added form validation\n    ...\n\n# Commit E details\n$ git show ef98765\ncommit ef98765...\nAuthor: John Doe\nDate:   Mon Feb 10 11:00:00 2025 +0100\n    Add OAuth integration\n    \n    - Implemented OAuth2 flow\n    - Added social login buttons\n    ...\n<\/code><\/pre>\n\n\n\n
                    New Commits After Rebase (D’ and E’):<\/h5>\n\n\n\n
                    # New Commit D' details\n$ git show de34567\ncommit de34567...\nAuthor: John Doe\nDate:   Mon Feb 11 14:30:00 2025 +0100  # Note the new timestamp\n    Add login form\n    \n    - Added login form component\n    - Added form validation\n    ...\n\n# New Commit E' details\n$ git show ab12345\ncommit ab12345...\nAuthor: John Doe\nDate:   Mon Feb 11 14:30:01 2025 +0100  # Note the new timestamp\n    Add OAuth integration\n    \n    - Implemented OAuth2 flow\n    - Added social login buttons\n    ...\n<\/code><\/pre>\n\n\n\n
                    Key Observations<\/strong><\/span><\/h5>\n\n\n\n
                    1. Commit Hash Changes:<\/strong>
                      • Original feature commits: cd45678<\/code> and ef98765<\/code><\/li>
                      • New rebased commits: de34567<\/code> and ab12345<\/code><\/li><\/ul><\/li>
                      • Timestamp Changes:<\/strong>
                        • Original commits: Feb 10, 2025<\/li>
                        • Rebased commits: Feb 11, 2025 (current rebase time)<\/li><\/ul><\/li>
                        • Content Changes:<\/strong>
                          • The commit messages and changes remain the same<\/li>
                          • Only the metadata (commit hash, timestamp) changes<\/li><\/ul><\/li>
                          • Branch Structure:<\/strong>
                            • Before: Branching history visible<\/li>
                            • After: Linear history<\/li><\/ul><\/li><\/ol>\n\n\n\n
                              <\/div>\n\n\n\n
                              Common Commands to View These Changes<\/h4>\n\n\n\n
                              # View complete graph\n$ git log --graph --oneline --all\n\n# View detailed commit information\n$ git show <commit-hash>\n\n# View branch structure\n$ git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit\n<\/code><\/pre>\n\n\n\n
                              <\/div>\n\n\n\n
                              Conclusion<\/h5>\n\n\n\n
                              Both merge and rebase have their place in Git workflows. The choice between them depends on our specific needs:<\/p>\n\n\n\n
                              • Choose merge<\/strong> for maintaining history and working with public branches<\/li>
                              • Choose rebase<\/strong> for a clean, linear history and private feature development<\/li><\/ul>\n\n\n\n
                                Remember that these aren’t mutually exclusive – many teams use both approaches depending on the situation. The key is understanding the implications of each method and choosing the right tool for our specific scenario.<\/p>\n","protected":false},"excerpt":{"rendered":"
                                Git offers different approaches to integrating changes from one branch into another. Two of the most common methods are merge and rebase. In this article, we’ll explore their differences, use cases, and impact on your development workflow. Initial Scenario Let’s start with a common development situation: Where: A, B, C represent commits on the master […]<\/p>\n","protected":false},"author":1,"featured_media":807,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[60],"tags":[495,494,971],"_links":{"self":[{"href":"https:\/\/nguenkam.com\/blog\/index.php\/wp-json\/wp\/v2\/posts\/3656"}],"collection":[{"href":"https:\/\/nguenkam.com\/blog\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/nguenkam.com\/blog\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/nguenkam.com\/blog\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/nguenkam.com\/blog\/index.php\/wp-json\/wp\/v2\/comments?post=3656"}],"version-history":[{"count":4,"href":"https:\/\/nguenkam.com\/blog\/index.php\/wp-json\/wp\/v2\/posts\/3656\/revisions"}],"predecessor-version":[{"id":3669,"href":"https:\/\/nguenkam.com\/blog\/index.php\/wp-json\/wp\/v2\/posts\/3656\/revisions\/3669"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/nguenkam.com\/blog\/index.php\/wp-json\/wp\/v2\/media\/807"}],"wp:attachment":[{"href":"https:\/\/nguenkam.com\/blog\/index.php\/wp-json\/wp\/v2\/media?parent=3656"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/nguenkam.com\/blog\/index.php\/wp-json\/wp\/v2\/categories?post=3656"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/nguenkam.com\/blog\/index.php\/wp-json\/wp\/v2\/tags?post=3656"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}