| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | doc: use union merge strategy for resolving conflicts in PendingReleaseNotes | Patrick Donnelly | 2020-08-29 | 1 | -0/+1 |
| | | | | | | | | 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> | ||||
| * | githubmap: define merge conflict resolution | Patrick Donnelly | 2017-10-10 | 1 | -0/+1 |
| Use "union" merge to automatically resolve trivial append merge conflicts from using ptl-tool.py. Signed-off-by: Patrick Donnelly <pdonnell@redhat.com> | |||||
 |
index : ceph | |
| ceph | Fast-forward packages |
| summaryrefslogtreecommitdiffstats |