2011-07-31 01:20:35 +00:00
|
|
|
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
|
2011-08-05 14:29:21 +00:00
|
|
|
|
|
|
|
|
> It should be as easy to undo such an accidential merge
|
|
|
|
|
> as it is to undo any other git commit, right? I quite like that git-annex
|
|
|
|
|
> no longer adds any clutter to the master branch, and would be reluctant
|
|
|
|
|
> to change that. --[[Joey]]
|
2014-05-24 20:29:41 +00:00
|
|
|
|
|
|
|
|
[[wontfix|done]] --[[Joey]]
|
