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

Merge erroneous branch into main #1447

Conversation

phargogh
Copy link
Member

@phargogh phargogh commented Nov 7, 2023

Sorry @emlys I accidentally created a new branch instead of having it merge into main.

phargogh and others added 2 commits November 6, 2023 15:15
…merging-main-into-release-branches-is-failing

Updating our auto-PR action to use `gh`
@phargogh phargogh requested a review from emlys November 7, 2023 00:05
@phargogh phargogh linked an issue Nov 7, 2023 that may be closed by this pull request
Copy link
Member

@emlys emlys left a comment

Choose a reason for hiding this comment

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

Sorry I didn't catch that!

@phargogh
Copy link
Member Author

phargogh commented Nov 7, 2023

Not to worry! I think I created the problem when I use the handy "create a branch for this issue" and accidentally created the branch on natcap/invest, so I think github tried to merge into that one. Whoops!

@emlys
Copy link
Member

emlys commented Nov 7, 2023

The failing test looks unrelated so I'll go ahead and merge

@emlys emlys merged commit 329da4f into main Nov 7, 2023
48 of 49 checks passed
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.

GitHub Action for merging main into release branches is failing
2 participants