Commit Graph

3 Commits

Author SHA1 Message Date
Fernando Fernández
8ce58f611b
Run merge conflict check on PR rebase/commit 2021-03-24 00:47:15 +01:00
Bill Thornton
158e435144 Prevent merge conflicts action from running on forks 2020-12-02 12:10:10 -05:00
Bill Thornton
fe3bd2e35d Add github action to label PRs with merge conflicts 2020-12-01 10:01:56 -05:00