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

Jump to bottom

Auto-pull from upstream #1

Open
nakasyou opened this issue Dec 12, 2024 · 11 comments
Open

Auto-pull from upstream #1

nakasyou opened this issue Dec 12, 2024 · 11 comments

Comments

@nakasyou
Copy link
Contributor

using GitHub Actions
@nakasyou
Copy link
Contributor Author

cc: @akku1139

@akku1139
Copy link
Contributor

hi

@akku1139
Copy link
Contributor

It is easy.
but resolving conflict is not easy

@akku1139
Copy link
Contributor

My idea

  1. If git can aut-merge, merge and push
  2. If some conflists occur, create a pull request and stop next run

@nakasyou
Copy link
Contributor Author

I think 1 isn't needed. It is enough to create PR when upstream is updated.

@akku1139
Copy link
Contributor

1 is very easy haha

@akku1139
Copy link
Contributor

Oh, this repo is not fork
https://github.com/scratchfoundation/scratch-gui

@akku1139
Copy link
Contributor

Auto sync
22ff8d1

@akku1139
Copy link
Contributor

@nakasyou Don't delete upstream branches.
sync workflow has checkout problem.
I will fix the issue soon.

@akku1139
Copy link
Contributor

Why!?
1873938

@akku1139
Copy link
Contributor

TODO: Automatically resolve package-lock.json conflicts

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@nakasyou @akku1139