merge

git – merge changes from untracked tree

I have a kind of a situation – There’s a project that we’ve forked but the person who originally forked it did not really know how git works so he just created a new repository and copied the code. Unfortunately that was not caught in time…