RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 10:37:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

doc: use union merge strategy for resolving conflicts in PendingReleaseNotes

Browse Source 
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>
This commit is contained in:
Patrick Donnelly 2020-08-28 18:02:59 -07:00
parent ed90c0768b
commit 048da58923
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -1 +1,2 @@
.githubmap merge=union
PendingReleaseNotes merge=union