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

Support force push #421

Merged
merged 28 commits into from
Feb 23, 2021
Merged

Support force push #421

merged 28 commits into from
Feb 23, 2021

Conversation

WizardOhio24
Copy link
Contributor

Closes #274

This currently force pushes (with SHIFT+P) but does not ask the user to confirm their action, I'll implement that as well.

@WizardOhio24
Copy link
Contributor Author

I added the confirm popup but the confirm box seems a bit small, I'll increase it's size.

@WizardOhio24
Copy link
Contributor Author

I think this can be merged(pending review), @extrawurst? The only thing is that it does not use the correct upstream branch at the moment, it uses the fact that the upstream must be named the same as the local in currently (in GitUI), so this will have to be changed when a upstream with a different name is supported.

@WizardOhio24 WizardOhio24 changed the title WIP: Support force push Support force push Nov 13, 2020
@extrawurst
Copy link
Owner

@WizardOhio24 why do you close these?

@extrawurst extrawurst reopened this Dec 8, 2020
@extrawurst
Copy link
Owner

did not have time to review them yet. still working myself through the PRs since yesterday

Copy link
Owner

@extrawurst extrawurst left a comment

Choose a reason for hiding this comment

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

@WizardOhio24 I think for force we should implement the finding of the remote name instead of simply assuming it is the same as the local branch. in case of force this could otherwise lead to bad surprises, don't you think?

assets/vim_style_key_config.ron Outdated Show resolved Hide resolved
@extrawurst extrawurst marked this pull request as draft January 9, 2021 11:19
@WizardOhio24
Copy link
Contributor Author

This now force pushes to the same place as a normal push would go to, which I think is just the set upstream repo.

@WizardOhio24 WizardOhio24 marked this pull request as ready for review February 2, 2021 22:09
@extrawurst extrawurst merged commit 6c974ee into extrawurst:master Feb 23, 2021
@extrawurst
Copy link
Owner

@WizardOhio24 thanks man!❤️

extrawurst pushed a commit that referenced this pull request May 27, 2021
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.

support force push
2 participants