search

CCI-MOC / flocx-market

2 stars 9 forks source link

We should fail commits that include conflict markers #35

Closed larsks closed 5 years ago

larsks commented 5 years ago

Sometimes we forget to finish resolving a conflict and accidentally commit files that include conflict markers. We should fail these commits and highlight the problem so that it can be corrected.