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

bug: Your branch is up to date with 'origin/master'. #9

Open
linonetwo opened this issue Apr 28, 2021 · 3 comments
Open

bug: Your branch is up to date with 'origin/master'. #9

linonetwo opened this issue Apr 28, 2021 · 3 comments

Comments

@linonetwo
Copy link

Your branch is up to date with 'origin/master'.
fatal: refusing to merge unrelated histories
Error: Process completed with exit code 128.

But actually

Screen Shot 2021-04-28 at 15 18 24

https://github.com/linonetwo/CDDA-Kenan-Modpack-Chinese/runs/2455149076?check_suite_focus=true

https://github.com/linonetwo/CDDA-Kenan-Modpack-Chinese/blob/28ae4db5b2021fbd9c0fc627530c8834828f41e7/.github/workflows/release-mod.yml#L24-L29

@linonetwo
Copy link
Author

need --allow-unrelated-history , how to add?

@linonetwo
Copy link
Author

Maybe you shouldn't push?

git push

Can you make an option to disable the push step? I'm using another action to do commit and push, so don't need this.

@discdiver
Copy link

See #13 - I've forked this and published an action that allows unrelated histories.

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

2 participants