merge-upstream icon indicating copy to clipboard operation
merge-upstream copied to clipboard

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

Open linonetwo opened this issue 4 years ago • 3 comments

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 avatar Apr 28 '21 07:04 linonetwo

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

linonetwo avatar Apr 28 '21 15:04 linonetwo

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.

linonetwo avatar Apr 28 '21 18:04 linonetwo

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

discdiver avatar Jan 31 '22 23:01 discdiver