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

Test mergify conflicts #19

Closed
wants to merge 4 commits into from
Closed

Test mergify conflicts #19

wants to merge 4 commits into from

Conversation

v1v
Copy link
Owner

@v1v v1v commented Mar 18, 2021

What does this PR do?

Why is it important?

Related issues

Closes #ISSUE

@mergify
Copy link

mergify bot commented Mar 18, 2021

This pull request is now in conflicts. Could you fix it @v1v? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b feature/fix-notifications upstream/feature/fix-notifications
git merge upstream/master
git push upstream feature/fix-notifications

This was referenced Mar 18, 2021
Merged
Merged
@v1v v1v closed this Mar 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@v1v