Il giorno mer 30 gen 2019 alle ore 18:13 Matteo Merli
<matteo.me...@gmail.com> ha scritto:
>
> On Wed, Jan 30, 2019 at 12:34 AM Enrico Olivelli <eolive...@gmail.com> wrote:
> > Jenkins merges the patch with current master before running tests, doesn't
> > it?
>
> I don't think this is being done by Jenkins, at least with the current
> configuration.
> I haven't seen any merge-conflict errors in Jenkins build while the
> conflict are then
> visible on GitHub where the "merge" button is disabled.
>
> It would be certainly nice to have in Jenkins for all these cases.
Currently you are using ${sha1} which means:
- merge with target branch if possible
- do not merge if it is not possible
this is the reason why you are not seeing merge conflicts
see docs in
https://wiki.jenkins.io/display/JENKINS/GitHub+pull+request+builder+plugin
or this example:
https://github.com/jenkinsci/ghprb-plugin/issues/563
Hope that helps
Enrico
