search

exions / merge-upstream

⤵️ Merge in changes from upstream. Useful for syncing upstream changes to fork.
https://github.com/marketplace/actions/merge-upstream
MIT License
23 stars 17 forks source link

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

Open linonetwo opened 3 years ago

linonetwo commented 3 years ago 
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 commented 3 years ago

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

linonetwo commented 3 years ago

Maybe you shouldn't push? https://github.com/exions/merge-upstream/blob/f319e34ccad113d4f524e9ca33f5dab14b51117c/action.yml#L38

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 commented 2 years ago

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