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

Publish changes from develop #145

Merged
merged 14 commits into from
Aug 9, 2024
Merged

Publish changes from develop #145

merged 14 commits into from
Aug 9, 2024

Conversation

Stanislaw-bnk
Copy link
Contributor

No description provided.

@pietrushnic
Copy link
Member

@Stanislaw-bnk please resolve conflicts as well as pre-commit.

@Stanislaw-bnk
Copy link
Contributor Author

It seems there is a merge conflict, but I've run pre-commit on develop and it seems good:
Screenshot from 2024-05-17 11-50-46

@pietrushnic
Copy link
Member

@Stanislaw-bnk you will not see merge conflicts locally only when you trying to merge. It seems to me that some massive formatting of menus.toml was introduced to your changes, and now there is a big merge conflict.

@Stanislaw-bnk
Copy link
Contributor Author

@Asiderr Could you please help resolve this merge conflict? I am not sure how to fix it.

@pietrushnic
Copy link
Member

@Stanislaw-bnk, you have to rebase those changes on top of the most recent one, then ask @gosiastyba for confirmation for this PR.

@Stanislaw-bnk
Copy link
Contributor Author

Stanislaw-bnk commented Jun 11, 2024

you have to rebase those changes on top of the most recent one, then ask @gosiastyba for confirmation for this PR.

@gosiastyba Could you please confirm that these changes in ToS from this PR are valid? Then we will merge from develop to main.

@Stanislaw-bnk
Copy link
Contributor Author

@gosiastyba ping

@artur-rs artur-rs merged commit 388ff03 into main Aug 9, 2024
5 checks passed
@artur-rs artur-rs changed the title ToS update Publish changes from develop Aug 9, 2024
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