Reputation: 4097
I have made some new commits in a fork. There are no branches (only master). The original account owner wants to transfer control to the whole code base to us, his original code plus the changes I have made since in the fork. What's the best way to do this and preserve history etc. Thanks
Upvotes: 4
Views: 3263
Reputation: 15449
NOTHING.
Since git is a distributed vcs this is actually pretty easy. You already have the history included in your fork. If there are not changes in the original after your fork then you are done.
If there are changes in the original after your fork, merge them in using normal git workflow and keep your copy.
EDIT:
Good explanation of distributed vcs: http://blog.teamtreehouse.com/why-you-should-switch-from-subversion-to-git
EDIT:
Github allows owners of private repositories to control their forks. So I see two options:
1) look at this: https://help.github.com/articles/how-to-transfer-a-repository. The caveat is that you can only transfer the root repo, so you have to get your changes into that.
2) git clone
the repo onto your local computer. Then follow GitHub's instructions on how to create a new repository. You can clone your fork and not worry about extra merging.
https://help.github.com/articles/create-a-repo
Personally I like option 2 if you don't care about any of the GitHub artifacts such as pull requests...
Upvotes: 2