Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enable godot #1118

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

enable godot #1118

wants to merge 2 commits into from

Conversation

MWT-proger
Copy link

I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en

Pull request type

Please check the type of change your PR introduces:

  • Bugfix
  • Feature
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • Documentation content changes
  • Other (please describe):

What is the current behavior?

Issue Number: #940

What is the new behavior?

Other information

@@ -6,15 +6,15 @@ import (
"context"
)

// discoveryComposeOptions is a holder of options
// discoveryComposeOptions is a holder of options.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to fix internal/cmd/gtrace tool because *_gtrace.go files are generated with tool

@asmyasnikov
Copy link
Member

Please rebase on upstream/master your branch

@asmyasnikov
Copy link
Member

git remote add upstream git@github.com:ydb-platform/ydb-go-sdk.git
git fetch upstream
git merge upstream/master (or git rebase upstream/master)
<fix all conflicts + git commit>
git push

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants