Update various branch references to main branch (#10913)

This commit is contained in:
Karl Burtram
2020-06-13 14:26:18 -07:00
committed by GitHub
parent ddb210e971
commit 434d017a6b
35 changed files with 51 additions and 51 deletions

View File

@@ -3,10 +3,10 @@ pool:
trigger:
branches:
include: ['master']
include: ['main']
pr:
branches:
include: ['master']
include: ['main']
steps:
- task: NodeTool@0
@@ -32,9 +32,9 @@ steps:
git config user.name "VSCode"
git checkout origin/electron-8.0.x
git merge origin/master
git merge origin/main
# Push master branch into exploration branch
# Push main branch into exploration branch
git push origin HEAD:electron-8.0.x
displayName: Sync & Merge Exploration