fix: correctly open conflicted files, diff view on click#74
Open
vivekvjn wants to merge 32 commits intomrcrowl:masterfrom
Open
fix: correctly open conflicted files, diff view on click#74vivekvjn wants to merge 32 commits intomrcrowl:masterfrom
vivekvjn wants to merge 32 commits intomrcrowl:masterfrom
Conversation
Owner
|
@hdpoliveira / @incidentist this PR is out of date now, but there might be something to keep around opening the right diff view in this commit (f7b9836). Can you please decide if you'd like to incorporate it or discard? Thanks |
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.
fixes #35 - error when clicking on the conflicted file which fails to open diff view. Further improvements to diff view needed, but this fixes the main issue.