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

Extend conflict resolver to handle all pages-graphql files(on promote) #14

Merged
merged 7 commits into from
Oct 24, 2024

Conversation

vitorflg
Copy link
Contributor

@vitorflg vitorflg commented Oct 3, 2024

What is the purpose of this pull request?

  • It adds an extension of the conflict resolver, resolving conflicts for all pages-graphql files pending a rebase. I'm using the MineWinsConflictResolver of the @vtex/api package.

What problem is this solving?

Slack thread

How should this be manually tested?

  • You can test it yarn linking all dependencies(@vtex/api, this module, and the toolbelt), and running with the alias:
    vtex-test promote After that, listing to conflicts should return an empty array.

Concerns

  • The body of the content comes in the getConflicts request. It should have a maximum of 100 MB added to memory. I don't think it's an issue, but it's something I thought about as a possible side-effect.

Screenshots or example usage

Types of changes

  • Refactor (non-breaking change that only makes the code better)
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Requires change to documentation, which has been updated accordingly.

Chores checklist

  • Update CHANGELOG.md

Copy link
Member

@victorhmp victorhmp left a comment

Choose a reason for hiding this comment

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

Code LGTM, but check the CI errors ;)

src/modules/promote.ts Outdated Show resolved Hide resolved
src/modules/promote.ts Show resolved Hide resolved
Copy link

@filafb filafb left a comment

Choose a reason for hiding this comment

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

LGTM

@vitorflg vitorflg merged commit a6ddbd0 into master Oct 24, 2024
1 check passed
@vitorflg vitorflg deleted the extend/conflict-resolver branch October 24, 2024 19:30
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.

4 participants