I have two git branches with different content. Why doesn't git merge them? It says, "Already updated."
I have a branch
with twice as many files.
How come when I
git checkout master
git merge another_branch
and doesn't merge additional files into
(Yes, I already did
git add .
, while I crossed it out
Says there is nothing to do.)
EDIT: The branch
has files, and the branch
has the same files and more. Why won't these additional files be merged?
EDIT: I solved the problem by copying the files from
to the external folder, checking
, copying the files back from the external folder and adding all the new files and making a new commit.
Think about it, I think if I made a small change in
and then committed, I could merge everything into master, but I couldn't try it.
source to share