Question

I have a master branch, and another_branch with twice as many files in it.

How come when I git checkout master then git merge another_branch it says Already up-to-date. and doesn’t merge the extra files into master?

(Yes, i have already done git add . while having another_branch checked out. git commit says there is nothing to commit.)

I already saw this post and this post, but so far nothing worked.

EDIT: The master branch has files, and the another_branch branch has the same files plus more. Why won’t those extra files be merged?

EDIT: I solved the problem by copying the files from another-branch to an external folder, checking out master, copying the files back in from the external folder, and adding all the new files and making a new commit.

Come to think of it, I think if I made a small change in another_branch then committed, I would have been able to merge everything into master, but I didn’t get to try it out.

Answer 1

You must commit your files on another_branch. Simply adding them with git add . is not enough.