CODEWITHSUNDEEP
iosgitversion-controlxcode4github
Msencenb
Msencenb

Reputation: 5104

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?

Upvotes: 1

Views: 558

Answers (1)

Adam Dymitruk
Adam Dymitruk

Reputation: 129744

Simply copy the files over, then

git add -A
git commit
git push

Upvotes: 2

Related Questions