VR-{3600, 3866, 3887}: Use backend merge and raise for conflict#485
Merged
Conversation
convoliution
changed the title
Contributor
Author
|
fyi @ravishetye |
conradoverta
reviewed
Apr 9, 2020
| other.branch_name or other.id[:7], | ||
| self.branch_name or self.id[:7], | ||
| msg = _VersioningService.MergeRepositoryCommitsRequest() | ||
| if self.branch_name is not None: |
Contributor
There was a problem hiding this comment.
I'm assuming you reviewed a vs b because I don't recall right now =)
Contributor
Author
There was a problem hiding this comment.
Yep, I've triple-checked this 😵
| raise RuntimeError( | ||
| "merge conflict;" | ||
| " resolution is not currently supported through the Client;" | ||
| " please create a new Commit with the updated blobs" |
Contributor
There was a problem hiding this comment.
Do we have somewhere in the docs showing how to do this?
Contributor
Author
There was a problem hiding this comment.
We currently do not! That sounds like a great idea.
I can make a ticket to create a guide for doing this.
conradoverta
approved these changes
Apr 9, 2020
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Blocked because settingbranch_aorbranch_bseems to result in a backend500.This backend bug has been resolved.