Xavier Morel 4d528465d9 [FIX] forwardport: incorrect / misleading conflict message ... Given a PR batch getting forward-ported together, if one of the PRs has a conflict the others should be considered "in conflict" as well, and should have a note pointing in that direction and indicating that the PR should be approved the normal way eventually. Which they do. However, the message is confusing as it gets bolted on the normal non-conflicting message, either noting that it's part of a chain or (worse because it gives conflicting indication) the "terminal" message recommending using the forwardbot to approve of the entire chain. I've no idea why I did it that way instead of just adding a case to the conditional, and the commit message provides no indication. But perform that change, it seems innocuous, hopefully there weren't good reasons I forgot about for doing it the other way around. Fixes #367		2020-05-20 07:43:53 +02:00
..
__init__.py	[ADD] forwardbot	2019-09-05 10:00:07 +02:00
forwardport.py	[FIX] forwardport: PR update through a closed PR	2020-02-26 16:21:24 +01:00
project.py	[FIX] forwardport: incorrect / misleading conflict message	2020-05-20 07:43:53 +02:00