2019-01-05 19:11:29 +00:00
|
|
|
steps:
|
2019-03-09 21:31:47 +00:00
|
|
|
# Rebase to target branch for every PR. This means users don't have to
|
|
|
|
# rebase every time target branch changes. As long as the PR applies cleanly, we
|
2019-01-05 19:11:29 +00:00
|
|
|
# will validate it.
|
2019-03-09 21:31:47 +00:00
|
|
|
- bash: |
|
2019-01-05 19:11:29 +00:00
|
|
|
git config user.email 'info@openttd.org'
|
|
|
|
git config user.name 'OpenTTD CI'
|
2019-03-09 23:44:21 +00:00
|
|
|
git rebase origin/${SYSTEM_PULLREQUEST_TARGETBRANCH}
|
2019-03-10 10:42:53 +00:00
|
|
|
displayName: 'Rebase to target branch'
|
2019-03-09 23:44:21 +00:00
|
|
|
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
|