Modify pre-commit hook to check merge conflicts accidentally committed not at current merge commit (#1927)
Attach a file by drag & drop or click to upload
