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.

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

Not maintained - forked, fixed, and published new GitHub Action #13

Open
discdiver opened this issue Jan 31, 2022 · 2 comments
Open

Not maintained - forked, fixed, and published new GitHub Action #13

discdiver opened this issue Jan 31, 2022 · 2 comments

Comments

@discdiver
Copy link

Leaving this here for folks trying to use this extension. Thank you for making this action! Unfortunately, this action doesn't appear to be maintained.

I have forked this repo and updated and published an action at https://github.com/marketplace/actions/merge-from-upstream-repo

Adding this GitHub Action would always cause the action to fail because unrelated histories cannot fast forward merge.

As suggested in Issue #11 by @lcenchew, getting the username and email and changing the merge command solved the problem in the action. The action now allows unrelated histories.

I fixed the README instructions and simplified them.

@lcenchew
Copy link
Contributor

Thanks! unable to spend more time due to work.

@getBoolean
Copy link

Thanks! I was going crazy thinking I was doing something wrong

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants