FlexMeasures / flexmeasures-client / 41659498917 / 6
95%
main: 95%

DEFAULT BRANCH: main
Ran
Files 6
Run time 1s
Badge
Embed ▾
README BADGES
x

If you need to use a raster PNG badge, change the '.svg' to '.png' in the link

Markdown

Textile

RDoc

HTML

Rst
coverage: 95.622%. Remained the same
41659498917.6

push

github

web-flow 
fix(pre-commit): stop docs/license.rst from blocking every merge commit (#243)

check-merge-conflict looks for a line of exactly seven "=", which is what
git writes between the two sides of a conflict. It is also what RST uses
to underline a title, so any title exactly seven characters long looks
like a conflict marker to it. docs/license.rst has one, "License", with
both an overline and an underline.

The hook scans the whole tree, not just the files being committed, and
only while a merge is in progress. So it passes in ordinary use and then
blocks every merge commit in this repository, on two lines of a file the
merge never touched. The only way through is SKIP=check-merge-conflict,
which also skips the real conflicts the hook exists to catch, in a commit
where they are at their most likely.

docs/license.rst is now excluded. It is the only tracked file that
matches any of the hook's patterns, so nothing else loses coverage, and
the file is a seven-line stub around an include of LICENSE.txt, which is
not where a conflict is going to hide.

Lengthening the adornments instead would have worked too, but it fixes
only this one file: the next seven-character title brings the problem
back. It would also break the convention the other documents follow, of
an adornment exactly as long as its title.

Verified by faking an in-merge state and running the hook over the tree:
a file with real conflict markers is still reported, and docs/license.rst
no longer is.


Claude-Session: https://claude.ai/code/session_01CcpawsJs74cSwFLXkz7ZwW

Signed-off-by: F.N. Claessen <claessen@seita.nl>
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>

961 of 1005 relevant lines covered (95.62%)

0.96 hits per line

Source Files on job macos-latest - py3.13 - 41659498917.6