bringing changes from one repo to other
- From
- Shantanu Pavgi <pavgi@uab.edu>
- Date
- Jun 30, 2011, 17:36 UTC
- Message-ID
- <F750768F-DC8E-435E-813A-C89AE9B9D89A@uab.edu>
Hi,
I need to bring in changes from one git repository (say repo-A) to other(say repo-B) preferably preserving the commit history. The repo-A contains few initial bad-commit points - includes files that should have been ignored (e.g temporary files generated at runtime) and large number of files got committed in one go. Also, the repo-A and repo-B don't have any common commit point with common set of files. Is there any way to get commits from repo-A to repo-B? I tried git cherry-pick, but I am not able to preserve history after resolving conflicts. Any comments or suggestions will be really helpful.
Thanks, Shantanu.