Stuck on an issue?

Lightrun Answers was designed to reduce the constant googling that comes with debugging 3rd party libraries. It collects links to all the places you might be looking at while hunting down a tough bug.

And, if you’re still stuck at the end, we’re happy to hop on a call to see how we can help out.

end-of-file-fixer fails against a ".git/MERGE_MSG" file

See original GitHub issue

I’m running git merge --no-ff release-7.1.2 -m "Merge branch 'release-7.1.2' into master" and it fails because it’s incorrectly checking files inside the .git directory:

Fix End of Files.........................................................Failed
hookid: end-of-file-fixer

Fixing .git/MERGE_MSG

pre-commit 1.11.1
git version 2.19.0
macOS 10.14 (18A391)

Issue Analytics

State:
Created 5 years ago
Comments:16 (16 by maintainers)

Top GitHub Comments

1reaction

revoltercommented, Sep 27, 2018

And thank you for the release ❤️

0reactions

asottilecommented, Sep 27, 2018

Thanks again for the issue and fix 🎉

Top Results From Across the Web

How to solve git merge error "Swap file .MERGE_MSG.swp ...

First of all, check that MERGE_MSG file (not MERGE_MSG.swp), and see if it exists ... The error message says it's ~/Documents/Sites/recipegenerator/.git/.

Fixing a common problem with a Git Merge - In Plain English

Firstly, let's try to understand why we got this message. There a few options : This happens when a commit was made to...

pre-commit

Git hook scripts are useful for identifying simple issues before ... The pre-commit config file describes what repositories and hooks are installed.

Git merge conflicts | Atlassian Git Tutorial

Git will mark the file as being conflicted and halt the merging process. ... A merge failure on start will output the following...

git-merge Documentation - Git

Prepare the default merge message as if merging to the branch <branch> , instead of the name of the real branch to which...