Skip to content

Conversation

beerlincur
Copy link

@beerlincur beerlincur commented May 6, 2023

the first commit contains only changes in the code, the second commit after the npm run build

beerlincur and others added 28 commits May 6, 2023 15:38
…CompilerVersion

Update Tact compiler to latest version
[0.4.0] - 2023-09-29
- Add the Jetton Token Standard example.
Update (examples)-06-contract-deploy-another-page.svelte.ad13b189.js
`overrides` used to be `override` in earlier Tact versions
Addresses in Tact are stored just like in FunC, that is, they take 267 bits
anton-trunov
anton-trunov previously approved these changes Nov 27, 2023
Copy link
Member

@anton-trunov anton-trunov left a comment

Choose a reason for hiding this comment

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

Thanks for the fix! If you can rebase your PR, I'm happy to merge it

@anton-trunov anton-trunov self-assigned this Nov 27, 2023
@beerlincur
Copy link
Author

Thanks for the fix! If you can rebase your PR, I'm happy to merge it

hello! trying to rebase onto your main branch. facing numerous merge conflicts in build-result files. trying to Accept Your changes, but it shows errors and conflicts about some deleted files anyway.

@anton-trunov
Copy link
Member

A workaround here would be to just have the changes in the markdown files. I'll regenerate the rest of the files in a separate PR

# Conflicts:
#	docs/04-loops.html
#	docs/_app/immutable/entry/(examples)-04-if-statements-page.svelte.7ab9cd84.js
#	src/routes/(examples)/04-if-statements/content.md
@beerlincur
Copy link
Author

A workaround here would be to just have the changes in the markdown files. I'll regenerate the rest of the files in a separate PR

reverted my [builded] commit and rebased it. could you, please, take a look at result?

@anton-trunov
Copy link
Member

Looks like something went wrong with the rebase:
image

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

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants