fix wrong rebase branch

This commit is contained in:
Jakub Sokołowski 2018-07-20 10:17:21 +02:00
parent 3229f95ca9
commit 0e502ac5b8
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020

2
Jenkinsfile vendored
View File

@ -30,7 +30,7 @@ timeout(90) {
checkout scm checkout scm
try { try {
sh 'git rebase origin/desktop' sh 'git rebase origin/develop'
} catch (e) { } catch (e) {
sh 'git rebase --abort' sh 'git rebase --abort'
throw e throw e