backup.proto: rename backup.proto to solve name conflict with badger … #780
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
|
should we change the package name 🤔 Line 2 in dd85fc3 |
ZipFast
force-pushed
the
conflict_with_badger
branch
3 times, most recently
from
16e37b0
to
6bc4974
Compare
…in merging BR into TiDB
3pointer
force-pushed
the
conflict_with_badger
branch
from
6bc4974
to
fc14848
Compare
|
Do we need to proceed with this pull request? cc @3pointer |
|
closing for inactivity. |
Yes, we need this PR if we want to merge BR into TiDB. |
8 tasks
disksing
approved these changes
Aug 4, 2021
YuJuncen
approved these changes
Aug 4, 2021
glorv
approved these changes
Aug 5, 2021
|
@3pointer |
|
@coocood do you mean that we can remove the proto in pingcap/badger since it is our own fork? |
yes |
daimashusheng
pushed a commit
to daimashusheng/kvproto
that referenced
this pull request
Sep 2, 2021
…in merging BR into TiDB (pingcap#780)
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.
…in merging BR into TiDB
closes #790
github.com/pingcap/badger also has the backup.proto, so when we merge the BR code into TiDB, it will cause panic due to conflict file name
backup.proto.