Don't show update-pr-from-base-branch when there are conflicts
#5768
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
fregante
commented
Jul 3, 2022
Comment on lines
63
to
66
| mergeable | ||
| viewerCanEditFiles | ||
| canBeRebased | ||
| mergeStateStatus |
There was a problem hiding this comment.
I may be misunderstanding these 2 new fields, but they seem to always match.
- Either it's conflicting, cannot be rebased and dirty
- or mergeable, can be rebased and clean
Comment on lines
55
to
59
| // TODO: Find how to determine whether the branch needs to be updated via v4 | ||
| api.v3(`compare/${base}...${head}`), | ||
|
|
||
| if (status === 'diverged') { | ||
| // Some fields are just for testing | ||
| api.v4(` |
There was a problem hiding this comment.
Ideally we'd just use v4, but I still don't see any fields for this. https://twitter.com/fregante/status/1543557018576830464
fregante
changed the title
update-pr-from-base-branchupdate-pr-from-base-branch when there are conflicts
yakov116
reviewed
Oct 23, 2022
| import {getConversationNumber} from '.'; | ||
|
|
||
| interface PullRequestInfo { | ||
| // TODO: Probably can be used for #3863 and #4679 |
There was a problem hiding this comment.
Not sure what you mean by this comment
refined-github/source/features/restore-file.tsx
Lines 18 to 27 in ebfb5f6
We are already using it
fregante
added a commit
that referenced
this pull request
May 20, 2023
Merged
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.
update-pr-from-base-branchsometimes duplicates native functionality #5586Test URLs
Native button: refined-github/sandbox#9
Our feature: refined-github/sandbox#11
Before
After