StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

POI have two git branches with different content. Why won't git merge them? It says "Already up-to-date."
text
Body
copied!<p>I have a <code>master</code> branch, and <code>another_branch</code> with twice as many files in it.</p> <p>How come when I <code>git checkout master</code> then <code>git merge another_branch</code> it says <code>Already up-to-date.</code> and doesn't merge the extra files into <code>master</code>?</p> <p>(Yes, i have already done <code>git add .</code> while having <code>another_branch</code> checked out. <code>git commit</code> says there is nothing to commit.)</p> <p>I already saw <a href="https://stackoverflow.com/questions/3098569/im-trying-to-merge-two-different-branches-but-git-tells-me-that-everything-is">this</a> post and <a href="https://stackoverflow.com/questions/5326894/git-how-to-merge-branches">this</a> post, but so far nothing worked.</p> <p>EDIT: The <code>master</code> branch has files, and the <code>another_branch</code> branch has the same files plus more. Why won't those extra files be merged?</p> <p>EDIT: I solved the problem by copying the files from <code>another-branch</code> to an external folder, checking out <code>master</code>, copying the files back in from the external folder, and adding all the new files and making a new commit.</p> <p>Come to think of it, I think if I made a small change in <code>another_branch</code> then committed, I would have been able to merge everything into master, but I didn't get to try it out.</p>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload