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 ability to ignore merge conflicts #17

Merged

Conversation

adrian-gomez
Copy link
Contributor

More actions could be added like "comment". But ignoring seems like a good start as the PR itself will get a merge conflict notification from github

Copy link
Owner

@chinthakagodawita chinthakagodawita left a comment

Choose a reason for hiding this comment

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

Looks good to me, thanks for adding this!

@chinthakagodawita chinthakagodawita changed the title Allow to ignore merge conflicts Add ability to ignore merge conflicts Feb 10, 2020
@chinthakagodawita chinthakagodawita merged commit 699da47 into chinthakagodawita:master Feb 10, 2020
@chinthakagodawita
Copy link
Owner

Released as part of v0.1.4

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.

2 participants