diff options
| author |  http://joeyh.name/ <http://joeyh.name/@web> | 2014-04-02 19:51:07 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2014-04-02 19:51:07 +0000 |
| commit | ef3d4e1a9d8dd74a00d140f1817e09c6f9bb8339 (patch) | |
| tree | c3cd81d1b13d46318ff74e9690619dd58a0d8490 | |
| parent | 0862fa7a870c96bf94890980d4456c9b67ed735e (diff) | |
Added a comment
| -rw-r--r-- | doc/forum/unrelated_repositories_sync/comment_1_c899b7b05a96d14e25c2efadff3b4e52._comment | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/forum/unrelated_repositories_sync/comment_1_c899b7b05a96d14e25c2efadff3b4e52._comment b/doc/forum/unrelated_repositories_sync/comment_1_c899b7b05a96d14e25c2efadff3b4e52._comment new file mode 100644 index 000000000..7df8a0eb9 --- /dev/null +++ b/doc/forum/unrelated_repositories_sync/comment_1_c899b7b05a96d14e25c2efadff3b4e52._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.244" + subject="comment 1" + date="2014-04-02T19:51:06Z" + content=""" +It might help if you think about these two different repositories as branches. You have 2 branches with different files in them, and you want to produce a third branch with some mix of the two. + +I think git is perfectly capable of doing that. Where it gets hairy is dealing with merges when either of the 2 repositories change going forward. The same as if you've forked and modified source code, you will need to do *something* to resolve merges. +"""]] |