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

[Rehearsal] Merge "mx-sdk-specs" into "mx-specs" #52

Draft
wants to merge 87 commits into
base: main
Choose a base branch
from

Conversation

andreibancioiu
Copy link

@andreibancioiu andreibancioiu commented Dec 29, 2023

Do not approve this just yet.
This is just a rehearsal for merging mx-sdk-specs into mx-specs.

Steps performed to prepare the PR:

# clone both repositories in a workspace
mkdir merging-sandbox && cd merging-sandbox
git clone [email protected]:multiversx/mx-sdk-specs.git
git clone [email protected]:multiversx/mx-specs.git

# create a wrapping folder for the SDK specs
cd mx-sdk-specs
git filter-repo --to-subdirectory-filter network-interaction-sdk

# add a "fake" (local) remote
cd ../mx-specs
git remote add sdk-specs ../mx-sdk-specs
git fetch sdk-specs

# do the merge in a new branch, then push it
git checkout -b merge-sdk-specs
git merge --allow-unrelated-histories sdk-specs/main
git push --set-upstream origin merge-sdk-specs

# cleanup: remove "merging-sandbox"

References:

andreibancioiu and others added 27 commits September 15, 2023 14:45
Re-define amount, define tokens and token transfers, allow transfer and execute
Return "Transaction" from factories
CustomTokenComputer: review follow-up
Remove create_zero address from address factory
Add chainID for DraftTransaction and renamed file
sdk-wallet: fix names, move behavior (functions)
@andreibancioiu andreibancioiu self-assigned this Dec 29, 2023
@andreibancioiu andreibancioiu changed the title [DRAFT] Merge mx-sdk-specs into mx-specs [DRAFT] Merge "mx-sdk-specs" into "mx-specs" Dec 29, 2023
@andreibancioiu andreibancioiu changed the title [DRAFT] Merge "mx-sdk-specs" into "mx-specs" [Rehearsal] Merge "mx-sdk-specs" into "mx-specs" Dec 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants