This is an automated email from the ASF dual-hosted git repository.
eya pushed a commit to branch new-web
in repository https://gitbox.apache.org/repos/asf/age-website.git
The following commit(s) were added to refs/heads/new-web by this push:
new fe1a2734 Add CI for merge conflicts (#284)
fe1a2734 is described below
commit fe1a2734ee00adb6556cf427eed5317bf8face2c
Author: Muhammad Taha Naveed <[email protected]>
AuthorDate: Tue Apr 2 22:42:08 2024 +0500
Add CI for merge conflicts (#284)
- The CI checks for any unresolved conflicts in
the source branch of PR. It fails if there is
any, and passes otherwise.
---
.github/workflows/merge-conflict.yml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/.github/workflows/merge-conflict.yml
b/.github/workflows/merge-conflict.yml
new file mode 100644
index 00000000..c1f18b1b
--- /dev/null
+++ b/.github/workflows/merge-conflict.yml
@@ -0,0 +1,14 @@
+name: Check unresolved merge conflict
+
+on: pull_request
+
+jobs:
+ merge_conflict_job:
+ runs-on: ubuntu-latest
+ name: Find merge conflicts
+ steps:
+ # Checkout the source code so there are some files to look at.
+ - uses: actions/checkout@v3
+ # Run the actual merge conflict finder
+ - name: Merge Conflict finder
+ uses: olivernybroe/[email protected]
\ No newline at end of file
