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.

Sign up for GitHub

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

Jump to bottom

feat: add Bitrock Mainnet 1.4.1 contracts #426

Closed
wants to merge 10 commits into from
Closed

feat: add Bitrock Mainnet 1.4.1 contracts #426

wants to merge 10 commits into from

Conversation

BCrypto-dev
Copy link
Contributor

Fix #410

@BCrypto-dev BCrypto-dev requested a review from a team as a code owner March 27, 2024 16:57
@BCrypto-dev
Copy link
Contributor Author

Hey @mmv08,
I saw that you close this merge request: #443. Now I have conflicts with my merge request after creating this pull request two weeks ago. I can open again the pull request but please merge as soon as possible.

Thanks

@nlordell
Copy link
Collaborator

nlordell commented Apr 9, 2024

It looks like the PR can't be merged because of conflicts. You can try rebasing the PR.

@mmv08
Copy link
Member

mmv08 commented Apr 10, 2024

Hey @mmv08, I saw that you close this merge request: #443. Now I have conflicts with my merge request after creating this pull request two weeks ago. I can open again the pull request but please merge as soon as possible.

Thanks

Oops, I am sorry, somehow I missed your PR. Please ping me when you fix the conflicts and I'll try to merge it asap 🙏

@BCrypto-dev
Copy link
Contributor Author

BCrypto-dev commented Apr 10, 2024 •
edited
Loading

Hey @mmv08, I saw that you close this merge request: #443. Now I have conflicts with my merge request after creating this pull request two weeks ago. I can open again the pull request but please merge as soon as possible.
Thanks

Oops, I am sorry, somehow I missed your PR. Please ping me when you fix the conflicts and I'll try to merge it asap 🙏

Done! @mmv08

@mmv08
Copy link
Member

mmv08 commented Apr 10, 2024

Hey @mmv08, I saw that you close this merge request: #443. Now I have conflicts with my merge request after creating this pull request two weeks ago. I can open again the pull request but please merge as soon as possible.
Thanks

Oops, I am sorry, somehow I missed your PR. Please ping me when you fix the conflicts and I'll try to merge it asap 🙏

Done! @mmv08

It looks like something went wrong, the diff includes changes other than adding bitrock contracts

@BCrypto-dev
Copy link
Contributor Author

Hey @mmv08, I saw that you close this merge request: #443. Now I have conflicts with my merge request after creating this pull request two weeks ago. I can open again the pull request but please merge as soon as possible.
Thanks

Oops, I am sorry, somehow I missed your PR. Please ping me when you fix the conflicts and I'll try to merge it asap 🙏

Done! @mmv08

It looks like something went wrong, the diff includes changes other than adding bitrock contracts

It is because I did a git rebase with main branch to fix the conflicts. If it is an issue I can open a pull request again @mmv08 .

@mmv08
Copy link
Member

mmv08 commented Apr 10, 2024

Hey @mmv08, I saw that you close this merge request: #443. Now I have conflicts with my merge request after creating this pull request two weeks ago. I can open again the pull request but please merge as soon as possible.
Thanks

Oops, I am sorry, somehow I missed your PR. Please ping me when you fix the conflicts and I'll try to merge it asap 🙏

Done! @mmv08

It looks like something went wrong, the diff includes changes other than adding bitrock contracts

It is because I did a git rebase with main branch to fix the conflicts. If it is an issue I can open a pull request again @mmv08 .

It seems that rebase wasn't done correctly then. Please fix it or create a new PR, we cannot review a PR like that.

@BCrypto-dev BCrypto-dev deleted the feat-add-Bitrock-Mainnet-1.4.1 branch April 11, 2024 02:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nlordell nlordell Awaiting requested review from nlordell nlordell is a code owner automatically assigned from safe-global/safe-protocol

@akshay-ap akshay-ap Awaiting requested review from akshay-ap akshay-ap is a code owner automatically assigned from safe-global/safe-protocol

@mmv08 mmv08 Awaiting requested review from mmv08 mmv08 is a code owner automatically assigned from safe-global/safe-protocol

@remedcu remedcu Awaiting requested review from remedcu remedcu is a code owner automatically assigned from safe-global/safe-protocol

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[New chain]: Bitrock Mainnet
9 participants
@BCrypto-dev @nlordell @mmv08 @bm-commit @Zerppen @SergeevDmitry @Diego-c22 @calebguy @0xtubanator