This project is read-only.

Git merge command merges current branch to another branches. Depends on which branch is current, the result will be different.

Let’s start with a repository.

image

Current branch is master. If merge master with dev by running $ git merge dev, the result is below.

image

 

Or, if checkout dev as current branch.

image

Then merge it with master, the result is shown next.

image

 

What’s the difference?

  • Merging dev with master, dev branch moves forward. Master branch stay where it is.
  • Merging master with dev, master branch moves forward. dev branch stay where it is.

 

That means, current branch moves forward. Target branch stays where it is.

Last edited Oct 26, 2011 at 3:46 AM by yysun, version 4

Comments

No comments yet.