mirror of
https://github.com/ceph/ceph
synced 2024-12-24 04:14:07 +00:00
048da58923
Generally, the conflict resolution performed manually is always to do a union: automate this. This avoids pointless rebases of PRs. Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
3 lines
55 B
Plaintext
3 lines
55 B
Plaintext
.githubmap merge=union
|
|
PendingReleaseNotes merge=union
|