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

exp apply: force apply by default #5360

Merged
merged 2 commits into from Feb 2, 2021
Merged

Conversation

pmrowla
Copy link
Contributor

@pmrowla pmrowla commented Jan 29, 2021

Thank you for the contribution - we'll try to review it as soon as possible. πŸ™

After discussion with @dmpetrov and @dberenbaum, overwriting any conflicting workspace changes with --force should be the default behavior when applying an experiment commit. Due to the nature of how we hide git usage behind experiments, it is not obvious to the user why applying an experiment can cause git conflicts, and in typical use cases for exp apply, overwriting conflicting changes is likely the behavior the user was already expecting to begin with.

  • --no-force can be used to disable overwriting existing changes

@pmrowla pmrowla added ui user interface / interaction skip-changelog Skips changelog labels Jan 29, 2021
@pmrowla pmrowla self-assigned this Jan 29, 2021
@pmrowla pmrowla requested a review from a team February 1, 2021 06:45
@pmrowla pmrowla enabled auto-merge (squash) February 1, 2021 08:06
@pmrowla pmrowla disabled auto-merge February 1, 2021 08:06
@pmrowla pmrowla merged commit 2ea5ef0 into iterative:master Feb 2, 2021
@pmrowla pmrowla deleted the apply-force branch February 2, 2021 02:07
@jorgeorpinel
Copy link
Contributor

jorgeorpinel commented Apr 27, 2021

Hi. I don't think this was documented.

@pmrowla
Copy link
Contributor Author

pmrowla commented Apr 27, 2021

this PR is from before there were actual docs for experiments commands. It most likely got lost in the shuffle between when we stopped using the wiki for docs, and when my original exp command ref PR was opened and then closed (to be split up and managed separately on the docs repo side)

@jorgeorpinel

@jorgeorpinel
Copy link
Contributor

jorgeorpinel commented Apr 27, 2021

Makes sense! I just happened to walk into this when updating all the exp cmd options (#2421).

Free to contribute something there (if you have a chance) and I'll polish it up. Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skip-changelog Skips changelog ui user interface / interaction
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants