aboutsummaryrefslogtreecommitdiff
path: root/INTERESTING_PROJECTS.org
diff options
context:
space:
mode:
authoralexpdp7 <alex@pdp7.net>2025-05-10 21:41:31 +0200
committeralexpdp7 <alex@corcoles.net>2025-05-10 21:41:56 +0200
commit34bfb02c698e75cdecafaf4eb457832b91669194 (patch)
treeaeda801af4ae4bea1e6859c18911c5e316114d49 /INTERESTING_PROJECTS.org
parent40cf04163a1e343fb9d00ed412b8dcf7c4e2a310 (diff)
Add Mergiraf
Diffstat (limited to 'INTERESTING_PROJECTS.org')
-rw-r--r--INTERESTING_PROJECTS.org1
1 files changed, 1 insertions, 0 deletions
diff --git a/INTERESTING_PROJECTS.org b/INTERESTING_PROJECTS.org
index 0ab59e71..1b39e6b5 100644
--- a/INTERESTING_PROJECTS.org
+++ b/INTERESTING_PROJECTS.org
@@ -10,6 +10,7 @@ Also keeping things in a Org mode means I can classify and add notes.
- https://github.com/copier-org/copier/ - project templater
- https://github.com/Skyscanner/turbolift - operating on multiple repos
- https://github.com/sourcegraph/doctree - code browser
+ - https://mergiraf.org/ - Language-aware merge conflict solver
*** CI/CD
- https://github.com/earthly/earthly - Standalone build tool with containers
- https://github.com/reviewdog/reviewdog - Error parser than can annotate GitHub pull requests