UI: add merge strategy #3581
Merged
UI: add merge strategy #3581
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eden-ohana
added
the
exclude-changelog
eden-ohana
added
include-changelog
|
Added @johnnyaug + @ozkatz for product feedback on the ui |
johnnyaug
reviewed
Jun 29, 2022
| <FormControl> | ||
| <FormLabel id="demo-radio-buttons-group-label">Merge Strategy</FormLabel> | ||
| <FormHelperText> | ||
| In case of a merge conflict, this option will force the merge process |
Comment on lines
219
to
222
| In case of a merge conflict, this option will force the merge process | ||
| to automatically favor changes from the dest branch (”dest-wins”) or | ||
| from the source branch(”source-wins”). In case no selection is made, | ||
| the merge process will fail in case of a conflict. |
There was a problem hiding this comment.
Suggestion: use concrete branch names (I also added a missing space there).
Suggested change
| In case of a merge conflict, this option will force the merge process | |
| to automatically favor changes from the dest branch (”dest-wins”) or | |
| from the source branch(”source-wins”). In case no selection is made, | |
| the merge process will fail in case of a conflict. | |
| In case of a merge conflict, this option will force the merge process | |
| to automatically favor changes from <b>{dest}</b> (”dest-wins”) or | |
| from <b>{source}</b> (”source-wins”). In case no selection is made, | |
| the merge process will fail in case of a conflict. |
| </FormHelperText> | ||
| <RadioGroup | ||
| aria-labelledby="demo-radio-buttons-group-label" defaultValue="none" name="radio-buttons-group" row> | ||
| <FormControlLabel value="none" control={<Radio />} label="none" onChange={onStrategyChange}/> |
There was a problem hiding this comment.
Suggested change
| <FormControlLabel value="none" control={<Radio />} label="none" onChange={onStrategyChange}/> | |
| <FormControlLabel value="none" control={<Radio />} label="Default" onChange={onStrategyChange}/> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
closes #3266