]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ed90c07) | patch
doc: use union merge strategy for resolving conflicts in PendingReleaseNotes 36888/head
authorPatrick Donnelly <pdonnell@redhat.com>
Sat, 29 Aug 2020 01:02:59 +0000 (18:02 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Sat, 29 Aug 2020 01:59:30 +0000 (18:59 -0700)
commit048da589238a0c92390d119854b4d927e1837d2e
tree875a9737d24e484b2a9695fd93e5e77bfd3ca166tree | snapshot
parented90c0768b0c8cf09511e8971bba453e09e42697commit | diff
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>
.gitattributes diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.