Edward Thomson

Welcome

I'm a Program Manager for version control in Microsoft Visual Studio Team Services and the co-maintainer of the libgit2 project, the Git repository management library that underpins tools like GitHub, Visual Studio and Xcode. I also develop version control tools and I also write and speak about Git and version control.

All Things Git: The Podcast About Git

My buddy Martin and I created a podcast where we talk to people doing cool things with Git. We talk to the people who are building tools for Git and helping their teams be successful using it. If you're interested in Git or version control, you'll love it.

Listen Now

Blog: Merge vs Rebase: Do They Produce the Same Result?

December 21, 2017  •  10:29 PM

I get asked quite a lot whether I recommend a merge-based workflow, or one where people rebase onto master. But to be quite honest, I couldn't possibly care less. Your workflow is your workflow after all, it's up to your team to work in the way that's most productive for you. For some teams that's merging, for some teams that's rebasing… n the end, the code gets integrated and the end result is the same either way, whether you merge or rebase it, right?

Right?

If you're a rebase fan, you've probably run into cases where you get conflicts during a rebase that you wouldn't get during a merge. But that's not very interesting… is there a case where merge and rebase both finish and produce a result, but a different tree?

Is git-merge guaranteed to produce the same results as git-rebase?