Ask for update strategy instead of using merge as a default #305
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Using merge is a safe default update strategy, however might be a bit unexpected if someone uses the tool for the first time and doesn't really know this is going to happen, or has configured on a per-repo basis and forgets to do so for a new repo. There currently also isn't any logging to indicate which strategy is used, it just happens.
This PR changes the default to ask the user instead of using merge. It also provides examples of how to configure the setting for the future.