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.

Sign up for GitHub

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

Jump to bottom

Add extended conflicts example #1700

Merged
merged 2 commits into from
Mar 14, 2022
Merged

Add extended conflicts example #1700

merged 2 commits into from
Mar 14, 2022

Conversation

shadowspawn
Copy link
Collaborator

Add extended example file for .conflicts() (preparing for release).

FYI: @erezrokah

abetomo
abetomo approved these changes Mar 14, 2022
View reviewed changes
Copy link
Collaborator

@abetomo abetomo left a comment

Choose a reason for hiding this comment

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

👍

@shadowspawn shadowspawn merged commit 1d27078 into tj:develop Mar 14, 2022
@shadowspawn shadowspawn deleted the feature/conflicts-example branch March 14, 2022 04:58
@erezrokah
Copy link
Contributor

Thanks @shadowspawn and @abetomo, this is great!

@shadowspawn shadowspawn added the pending release Merged into a branch for a future release, but not released yet label Mar 14, 2022
@shadowspawn shadowspawn removed the pending release Merged into a branch for a future release, but not released yet label Apr 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abetomo abetomo abetomo approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@shadowspawn @erezrokah @abetomo