3 ms·
Your hook really shouldn't be running on the merge commit unless you have conflicts in your merge.
by QuercusMax 10mo ago
Your hook really shouldn't be running on the merge commit unless you have conflicts in your merge.
- mcv 10mo agoNever had conflicts on a merge? We've got a lot of people on the same codebase. Merge conflicts are a fact of life. And they wouldn't be a problem without the stupid commit hook. It's the commit hook that makes them a problem.
- QuercusMax 10mo agoIf you have conflicts then you can fix them and run your linter or formatter. If you have a no conflict merge it doesn't matter.
- mcv 10mo agoThanks, but that's not the issue here.