Skip to content

Conversation

nmdefries
Copy link
Collaborator

@nmdefries nmdefries commented Apr 8, 2022

Merging main into dev during the release process raises an error indicating that git doesn't recognize the two branches as having shared commit history. Solution from actions/checkout#125.

Allow workflow to be run manually in case automatic release fails.

@nmdefries nmdefries requested a review from korlaxxalrok April 11, 2022 14:11
Copy link
Contributor

@korlaxxalrok korlaxxalrok left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@nmdefries nmdefries merged commit 1c6fef0 into dev Apr 11, 2022
@korlaxxalrok korlaxxalrok deleted the ndefries/release-main-fix-refuse-merge branch April 12, 2022 19:55
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

Successfully merging this pull request may close these issues.

2 participants