blob: 9b0c8a3de6ba88ce852a4e346a29af0ac81004c5 (
plain)
1
2
3
4
5
6
7
8
9
|
With the storage layout v3, pulling the git-annex branch into the master branch is... less than ideal.
The fact that the two branches contain totally different data make an accidental merge worse, arguably.
Adding a tiny binary file called .gitnomerge to both branches would solve that without any noticeable overhead.
Yes, there is an argument to be made that this is too much hand-holding, but I still think it's worth it.
-- Richard
|
