Commit Graph

2 Commits (e0f95d1545eaf9cc4ebae9df1ff03d3e66d5b251)

Author SHA1 Message Date
Christian Muehlhaeuser 54d96c79b5 Removed unnecessary conversions ()
No need to convert to the same type.
zeripath baefea311f
Fix : Add LFS objects to base repository on merging ()
On merge we walk the merge history and ensure that all lfs objects pointed to in
the history are added to the base repository. This switches from relying on having git-lfs installed on the server, (and in fact .gitattributes being correctly installed.)