RepoMirrors
/
ceph
mirror of https://github.com/ceph/ceph
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
ceph/.gitattributes

3 lines
55 B
Plaintext
Raw Normal View History

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 19:05:41 +00:00
.githubmap merge=union
doc: use union merge strategy for resolving conflicts in PendingReleaseNotes 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>
2020-08-29 01:02:59 +00:00
PendingReleaseNotes merge=union