Skip to content

Commit

Permalink
scaffold a workflow to handle automated rebasing of changes and catch…
Browse files Browse the repository at this point in the history
… problems earlier (#1074)
  • Loading branch information
shiftkey authored Jun 2, 2024
1 parent 64f6d35 commit 865701f
Showing 1 changed file with 22 additions and 0 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/sync-with-upstream.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: 'Sync main branch with upstream'

on: workflow_dispatch

jobs:
sync-with-upstream:
runs-on: ubuntu-latest
name: Sync main branch with upstream
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Configure git
run: |
git config --global user.name "shiftbot"
git config --global user.email "[email protected]"
git remote add upstream https://github.com/desktop/desktop.git
shell: bash
- name: Fetch and merge
id: fetch-merge
run: |
git fetch upstream
shell: bash

0 comments on commit 865701f

Please sign in to comment.