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

Hopefully this will fix 'git push' on some PRs #1132

Merged
merged 1 commit into from
Apr 12, 2022

Conversation

ewels
Copy link
Member

@ewels ewels commented Apr 12, 2022

Not sure if this will work or not, but worth a try.

Based on testing with PR #1094

Doing git push there fails because the PR comes from a fork branch master which is the same as the target. So, GitHub and hub create a different branch name for working locally. Then, when you try to push that, it doesn't match the remote and you get this error:

fatal: The upstream branch of your current branch does not match
the name of your current branch.  To push to the upstream branch
on the remote, use
    git push [email protected]:lescai/nf-co.re.git HEAD:master
To push to the branch of the same name on the remote, use
    git push [email protected]:lescai/nf-co.re.git HEAD
To choose either option permanently, see push.default in 'git help config'.
Error: Process completed with exit code 128.

According to this old comment, the changes in this PR should hopefully get git push to work again 🤞🏻

@ewels
Copy link
Member Author

ewels commented Apr 12, 2022

I'd quite like to test this before bed. Currently failing on master so should be low risk to self-merge 👀

@ewels ewels merged commit 6b54d9f into nf-core:master Apr 12, 2022
@ewels ewels deleted the fix-linting-push-behaviour branch April 12, 2022 21:42
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.

1 participant