Skip to content

Replace RST header underline with one that pre-commit check-merge won't break on. #1057

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

Merged
merged 1 commit into from
Dec 24, 2021

Conversation

n2ygk
Copy link
Contributor

@n2ygk n2ygk commented Dec 23, 2021

Fixes #

Description of the Change

Workaround problem where the precommit merge hook breaks on the 7-character doulbe-underline for AUTHORS by having a false-positive broken commit error.

It pains me to do this but I'd rather catch actual merge conflicts than exclude checking this file.

Checklist

  • PR only contains one change (considered splitting up PR)
  • unit-test added
  • documentation updated
  • CHANGELOG.md updated (only for user relevant changes)
  • author name in AUTHORS

@n2ygk n2ygk requested a review from a team December 23, 2021 20:28
@n2ygk
Copy link
Contributor Author

n2ygk commented Dec 23, 2021

@codecov
Copy link

codecov bot commented Dec 23, 2021

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.64%. Comparing base (f111812) to head (b16b285).
Report is 222 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #1057   +/-   ##
=======================================
  Coverage   96.64%   96.64%           
=======================================
  Files          31       31           
  Lines        1756     1756           
=======================================
  Hits         1697     1697           
  Misses         59       59           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@n2ygk n2ygk added this to the 1.7.0 milestone Dec 23, 2021
@n2ygk n2ygk force-pushed the fix_pre_commit_authors branch from 8b040ee to b16b285 Compare December 23, 2021 21:20
@Andrew-Chen-Wang Andrew-Chen-Wang merged commit 4610616 into django-oauth:master Dec 24, 2021
n2ygk added a commit that referenced this pull request Jan 6, 2022
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