Merge two git repositories of same project

Question

I am currently the only developer working on a project I took over from my predecessor. When I took over the project, it was not under source control. So I created a new git

Answer 1

Sure, using the ours strategy!

Follow the the next steps (lines starting with # are comments):

# Navigate to your updated project
cd your-updated-project

# Add a remote pointing to the other git repository 
# (it can be a local path or an url; I used a local path)
git remote add old-project ../path/to/the/old/git/repo

# Get the content from that repo
git fetch old-project

# Merge the the old repo master branch in your current branch,
# BUT keeping your recent changes (see -s ours)
git merge old-project master -s ours

If you want to merge another branch from the old git repo, do git merge old-project -s ours (replace with the branch name you want to merge).