2 Commits

Author	SHA1	Message	Date
Patrick Donnelly	048da58923	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>	2020-08-28 18:59:30 -07:00
Patrick Donnelly	e0e348eedf	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>	2017-10-10 12:06:34 -07:00