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

support Portuguese #849

Merged
merged 3 commits into from
Apr 2, 2024
Merged

Conversation

zmgl
Copy link
Contributor

@zmgl zmgl commented Mar 12, 2024

Summary of Changes

Fixes # (if applicable - add the number of issue this PR addresses)

Test Data or Screenshots

By submitting this pull request, you are confirming the following:
  • I have reviewed the Contribution Guidelines.
  • I have performed a self-review of my own code.
  • I have updated my repository to match the develop branch.
  • I have included test data or screenshots that prove my fix is effective or that my feature works.
  • I have checked that all tests work and swiftlint is not throwing any errors/warnings.

@yaroslavyaroslav
Copy link
Collaborator

Hi, thanks for your participation in this project.

There are merge conflicts in this PR, could you please fix it before we move along?

@JeneaVranceanu JeneaVranceanu mentioned this pull request Apr 1, 2024
@JeneaVranceanu
Copy link
Collaborator

@zmgl @yaroslavyaroslav I've fixed the conflicts but in a separate PR. I was unable to open a PR into a branch of @zmgl web3swift fork unfortunately.

Copy link
Collaborator

@JeneaVranceanu JeneaVranceanu left a comment

Choose a reason for hiding this comment

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

@zmgl If you want your PR to be merged instead of mine (though technically the result is almost identical) you can merge my branch into yours and we will merge your PR. I'll approve it as soon as you fix the conflicts.

So far I approve but leave a "Requested changes" review until conflicts are fixed. Thanks for your contribution!

@JeneaVranceanu JeneaVranceanu added the enhancement New feature or request label Apr 1, 2024
@zmgl
Copy link
Contributor Author

zmgl commented Apr 1, 2024

@JeneaVranceanu I update the podspec, now the conflicts are fixed

@JeneaVranceanu
Copy link
Collaborator

@JeneaVranceanu I update the podspec, now the conflicts are fixed

There are still conflicts in your PR.

@JeneaVranceanu
Copy link
Collaborator

Oh, yes the problem is that you are editing a file that was deleted.
BIP39.swift moved from web3swift/KeystoreManager to Web3Core/KeystoreManager. Please move your changes to the new file and delete the old one. Thanks!

P.S. as you can see here there's no KeystoreManager directory: https://github.com/web3swift-team/web3swift/tree/develop/Sources/web3swift

@yaroslavyaroslav
Copy link
Collaborator

@JeneaVranceanu Sorry, but seems that I broke this PR once again 😅

@zmgl zmgl dismissed yaroslavyaroslav’s stale review April 1, 2024 20:51

The merge-base changed after approval.

# Conflicts:
#	Sources/web3swift/KeystoreManager/BIP39.swift
@zmgl
Copy link
Contributor Author

zmgl commented Apr 2, 2024

i merge develop to my branch.now it's worked @JeneaVranceanu

@JeneaVranceanu JeneaVranceanu merged commit 6bdb9e6 into web3swift-team:develop Apr 2, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants