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

Add resolveAll to the ConflicstResolver module #561

Merged
merged 2 commits into from
Oct 23, 2024

Conversation

vitorflg
Copy link
Contributor

@vitorflg vitorflg commented Oct 3, 2024

What is the purpose of this pull request?

  • Enable to resolve all pending conflicts in the same operation.

What problem is this solving?

Slack thread

How should this be manually tested?

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

Screenshots or example usage

Types of changes

  • Bug fix (a non-breaking change which fixes an issue)
  • New feature (a 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.

src/utils/MineWinsConflictsResolver.ts Outdated Show resolved Hide resolved
Copy link
Contributor

@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.

I second @victorhmp. LGTM after that.

@iagoaraujo iagoaraujo force-pushed the add/resolve-all-to-conflicts-resolver branch from dbd9f6c to 1c052c4 Compare October 23, 2024 14:16
@filafb filafb dismissed victorhmp’s stale review October 23, 2024 14:39

Changes requested were implemented.

@iagoaraujo iagoaraujo merged commit 9924145 into master Oct 23, 2024
3 checks passed
@iagoaraujo iagoaraujo deleted the add/resolve-all-to-conflicts-resolver branch October 23, 2024 14:39
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