]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fcaedc7 06673dd)
Merge pull request #70796 from yuriw/wip/ptl-tool-merge-conflict-cleanup main
authorYuri Weinstein <yweinste@redhat.com>
Tue, 4 Aug 2026 21:42:23 +0000 (14:42 -0700)
committerGitHub <noreply@github.com>
Tue, 4 Aug 2026 21:42:23 +0000 (14:42 -0700)
ptl-tool: recover cleanly from merge conflicts instead of crashing

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.