]> 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: 65b7543) | patch
githubmap: define merge conflict resolution 18223/head
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 10 Oct 2017 19:05:41 +0000 (12:05 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 10 Oct 2017 19:06:34 +0000 (12:06 -0700)
commite0e348eedf49f5f195f46e64d4caf34b5094b183
treee15d548408112d1d526cd4090099edbf3acd3daatree | snapshot
parent65b7543390c8ee2a797bc559a64c61e35dd77cf6commit | diff
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>
.gitattributes [new file with mode: 0644] blob
Unnamed repository; edit this file 'description' to name the repository.