Is merge without conflicts equivalent to rebase without conflicts?

Is it correct that a git merge will succeed with no conflicts if and only if the corresponding git rebase will succeed with no conflicts?

  • How to amend several commits in Git to change author
  • git am error: “patch does not apply”
  • Can I pull a specific commit with composer?
  • Does git have anything like `svn propset svn:keywords` or pre-/post-commit hooks?
  • Converting a repository from git to subversion
  • When force pushing to already sent pull request, ugly remnants of previous commits remains in issue
  • how to get packages from git using node's npm
  • How to list all tags within a certain git branch
  • GIT How to clean history pack for old deleted files?
  • How to use powershell to install and configure IIS, SSL certificate, urlrewrite, git and clone repository
  • Is there a “git touch” so I can push the same file with a new timestamp?
  • git merge vs rebasing
  • One Solution collect form web for “Is merge without conflicts equivalent to rebase without conflicts?”

    No, and in fact there’s a trivial case where merge works fine but rebase doesn’t:

    ...--o--A   <-- mainline
          \
           B--C--!C   <-- branch
    

    where C is a commit that conflicts with A, and !C is its reversion. Merging branch back into mainline is equivalent in source-tree effect to merging commit B back into mainline, while rebasing copies both C (which conflicts with A) and then !C (which when being resolved, also conflicts with A).

    Of course, you can rebase interactively and simply drop both C and !C in this case, but in more complex chains, you can see how a commit might conflict with A but a subsequent commit might effectively resolve that conflict “in advance”, so that merging the tip of the branch back into the mainline has no conflicts.

    Git Baby is a git and github fan, let's start git clone.