Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

scaffold a workflow to handle automated rebasing of changes and catch problems earlier #1074

Merged
merged 3 commits into from
Jun 2, 2024
Merged

scaffold a workflow to handle automated rebasing of changes and catch problems earlier #1074

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99358df
Create sync-with-upstream workflow to automate rebasing local changes…
shiftkey Jun 2, 2024
1f84da6
oops
shiftkey Jun 2, 2024
49a9196
liiint
shiftkey Jun 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .github/workflows/sync-with-upstream.yml
View file
Open in desktop
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
Loading