Jenkins build fails with "ERROR: This PR contains 1 merge commit(s)"
holydhaliwal
Senior Member
Posts: 114
#1
2019-06-01, 00:36
I've made a pull request however the Jenkins immediately fails when building with the error "ERROR: This PR contains 1 merge commit(s)". I'm not super familiar with git or jenkins but any advice on how to fix this would be appreciated!

Link to pull request: https://github.com/xbmc/xbmc/pull/16225
Find
Reply
Fuzzard
Team-Kodi Member
Posts: 584
#2
2019-06-01, 02:54
(2019-06-01, 00:36)holydhaliwal Wrote: I've made a pull request however the Jenkins immediately fails when building with the error "ERROR: This PR contains 1 merge commit(s)". I'm not super familiar with git or jenkins but any advice on how to fix this would be appreciated!

Link to pull request: https://github.com/xbmc/xbmc/pull/16225

Rebase to get rid of the below commit

Merge remote-tracking branch 'origin/oreo_channel_metadata' into oreo… 
…
Find
Reply

Home
Search
Help
Logout Mark Read Team Forum Stats Members Help
Jenkins build fails with "ERROR: This PR contains 1 merge commit(s)"0