Fix build error due to unresolved merge conflict #2493
Merged
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
My local build of delve which apparently pulls in the master branch starting breaking. This is the culprit. Error: ``` go-delve#9 75.27 # github.com/go-delve/delve/service/dap go-delve#9 75.27 /usr/src/github.com/go-delve/delve/service/dap/server.go:107:1: syntax error: unexpected <<, expecting field name or embedded type go-delve#9 75.27 /usr/src/github.com/go-delve/delve/service/dap/server.go:110:1: syntax error: unexpected ==, expecting field name or embedded type go-delve#9 75.27 /usr/src/github.com/go-delve/delve/service/dap/server.go:113:1: syntax error: unexpected >>, expecting field name or embedded type ```
|
@fairclothjm that was quick! Hah, thanks for this. I must have accidentally merged something in with a conflict. The GH UI typically prevents this and I don't remember anything I pulled in failing CI, but... such is life. Thanks for the patch. |
|
Thanks for getting this so quick |
|
@polinasok @suzmue does this conflict resolution look correct to both of you? This came as a result of merging #2444 which contained this conflict in a commit. That's my fault for merging. |
|
LGTM. Sorry about that. |
|
Thanks! |
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.
My local build of delve which apparently pulls in the master branch started breaking. This is the culprit.
Error: