1
0
mirror of https://github.com/ceph/ceph synced 2025-01-19 01:21:49 +00:00
Commit Graph

1 Commits

Author SHA1 Message Date
Patrick Donnelly
e0e348eedf
githubmap: define merge conflict resolution
Use "union" merge to automatically resolve trivial append merge conflicts from
using ptl-tool.py.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-10-10 12:06:34 -07:00