Guys, 
this might be a trivial or already answered question, but I'm not able to 
find anything on the subject (perhaps I'm not sure what to ask about in the 
git terminology).
As a background -- we are planning to migrate Kaldi from the sf.net svn 
repository to github.  
There are already Kaldi repositories in github (created by git svn clone 
and pushing to github), created by independent developers.
As far as I understand, looking at the sha sums, from git POV these are 
completely different repositories. 
Is there some way how to explain to git, that content-wise, these are the 
same directories?

To give you a concrete example:
Let's take these two repositories
https://github.com/jtrmal/kaldi
https://github.com/vimal-manohar91/kaldi-git

They share the trunk (master),  but  when I clone my repo:
git clone https://github.com/jtrmal/kaldi
git remote add vimal https://github.com/vimal-manohar91/kaldi-git

and then for example:
git checkout dur-model
git merge vimal/DCCA

will generate a conflict for (possibly) every file in the repository and 
will auto-resolve most/some of them, but there still be ~1000 conflicted 
files. That is a nightmare.
Is there some way how to "explain" git that these two repositories are 
(almost) the same, content-wise? 

Thanks a lot,
yenda



-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to