Git：无法将功能分支合并到当前分支

Question

I create a xxx branch from master and then create yyy from xxx branch. There are 2 files in xxx branch and then I add one file after creatimng the branch yyy. Now I want to apply the changes in the yyy branch to xxx branch by merge but after running the following:

git checkout yyy
git merge xxx

It gives "Already up to date." message, but I do not see the changes on branch xxx, but the changes are seen on the branch yyy. I mean that there are still 2 files in xxx and the added file is not seen.

So, my questions are:

1. Is there any flag, etc that I should do in order to merge these 2 branch?

2. Normally I use Gith Bash in order to run git commands. Is it better Git CMD? And can I use cmd instead of git command lines? I mean is there any pros or cons between them?

Answer 1

It looks like you have the things the other way around. You want to merge yyy to xxx, so you should do:

git checkout xxx
git merge yyy

Git is right in saying that yyy is up to date, when you try to merge xxx, as yyy is based on xxx.

You can have a look at this tutorial:
https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging

Answer 2

I think you have your branches backwards in your commands.

According to this git cheatsheet

$ git checkout [branch-name]

• Switches to the specified branch and updates the working directory

$ git merge [branch]

• Combines the specified branch's history into the current branch ...

For your case:

If branch yyy has changes and you want to merge changes into branch xxx :

$ git checkout xxx    --Checkout branch to update
$ git merge yyy       --Merge yyy changes into current branch