Skip to content

Add prompt_force_push option #1674

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

Merged
merged 1 commit into from
Mar 14, 2025
Merged

Conversation

fmbarina
Copy link
Contributor

Solves #1673.

A quick and simple addition, but I think I changed everything needed. Tested ok. Default true, no surprises. People who dislike it can find the option on their own. Though, I'll be honest, this still feels like a bit of a weird feature to have enabled by default. Spooked me a little.

If there's anything you'd like changed, be it code, names, or even the commit message, feel free to say so. Not sure I got the coding style, so I'm a little scared of introducing stuff that doesn't fit in.

@fmbarina
Copy link
Contributor Author

That's odd. Sorry about that, could someone help me understand this test suite? Seems there's an issue with the branch popup rendering/view, but some tests haven't been written yet. I can't tell if failure is expected or not.

@CKolkey
Copy link
Member

CKolkey commented Mar 10, 2025

Don't worry about that; its not you, it's some CI runner issue that I've had no time to investigate. Currently at home with four month old twins, so... CI failures has been low priority.

Thanks for taking the time to do this. I'll try to have it merged soon.

Oh, but to answer your question, for fun I wrote an e2e test runner in ruby, but haven't finished writing all the tests I wanted because writing the infrastructure code was more fun than the tests themselves. So what you're seeing is a test failure, and some todos.

@fmbarina
Copy link
Contributor Author

Don't worry, take however long you need! Hope you're having a great time with them.

Allows users to disable the prompt to force push when branches diverge.
@CKolkey CKolkey force-pushed the disable-force-prompt branch from 76413e1 to 0e58b14 Compare March 14, 2025 12:37
@CKolkey CKolkey merged commit fa91e9d into NeogitOrg:master Mar 14, 2025
6 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.

2 participants