Search code examples
iosgitversion-controlxcode4github

Merging two git repositories (accidentally downloaded .zip from github, need to merge back in)

Ok so I have an iOS project I'm tracking with git / github.

I downloaded a copy of the master branch (.zip format), and then accidentally started working on that xcode project. So I have

-- Original xCode project where I usually push/pull from github

-- downloaded xcode project that is one step ahead of my project on github.

Basically I want the downloaded/modified project to be my next commit in my original git repository.... but its a completely separate project now. Is there a way I can merge two separate git repositories / projects?

Solution

  • Simply copy the files over, then

    git add -A
git commit
git push