Hi Joey,
We have a particular case where we need to merge datalad repos which were created separately.
I was thinking to simply merge the git-annex branches with --allow-unrelated-histories and initial tests show limited conflicts that can be easily fixed by using an union merge driver.
Conflicts mainly arise in:
- preferred-content.log
- remote.log
- uuid.log
- very few .tsv and .tsv.log for file that were created as identical of both sides.
Do you see any issues doing that?
Thanks
The git-annex branch is automatically merged by git-annex, it doesn't matter if it has unrelated histories or not. The merge will always succeed, without conflicts.
All you need to do is pull the git-annex branch from a remote, and run
git-annex merge.If for some reason you need to manually merge the git-annex branches, yes all it takes is a simple union merge where on conflict you concatenate both versions of the conflicted file together.