Hi, I'd try rebasing your branch against master to eliminate the merge conflict.
On Monday, August 31, 2020 at 4:37:15 PM UTC-4 ba...@google.com wrote: > Hi All! > > I have an open PR <https://github.com/django/django/pull/13351> and am > having difficulty getting the Jenkins checks to pass. I have amended my > original commit a few times but these changes are not reflected in Jenkins. > > One test, test_middleware_headers, was failing with my original commit. I > had forgotten to update this test to reflect the new default header I added > to the security middleware. I added the new header to the list of expected > headers in this test and amended my commit. > > The checks were run again with new builds but the changes I made to the > commit were not reflected in Jenkins. The error message about this failing > test did not change at all. In Jenkins it appears that this test is not > altered as the expected output of the test has not been updated to reflect > the changes I made to it. However, I can see that the changes to this test > were added as a part of my commit in test_settings.py. > > This test passes locally but does not pass on any configuration in > Jenkins. How can I get my changes to this test to reflect correctly in > Jenkins so that the checks will pass? > > Thank you! > -- You received this message because you are subscribed to the Google Groups "Django developers (Contributions to Django itself)" group. To unsubscribe from this group and stop receiving emails from it, send an email to django-developers+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/django-developers/7b9cba21-7c65-4549-9d76-b69bf763ae93n%40googlegroups.com.
