mergiraf/mergiraf
mergiraf/mergiraf
9
213
Fork 45
Code Issues 50 Pull requests 6 Releases 19 Activity Actions
Roadmap?
#196 opened 2025-02-10 11:36:13 +01:00 by wetneb
Kind
Documentation
Meeting up at FOSDEM 2026
#570 opened 2025-08-17 10:16:09 +02:00 by wetneb
Labels Milestones
New issue
50 Open 113 Closed 163 All
Label
Clear labels
Compat/Breaking
Kind
Bad merge
Kind
Bug
Kind
Documentation
Kind
Enhancement
Kind
Feature
Kind
New language
Kind
Security
Kind
Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Need More Info
Milestone
No milestone
Projects
Clear projects
Assignee
Clear assignees
No assignee
ada4a
bobvanderlinden
funkeleinhorn
mathstuf
senekor
wetneb
zivarah
Commutative merging when the commutative parent is absent from the base revision
Kind
Enhancement
#613 opened 2025-10-09 17:08:23 +02:00 by wetneb
C: Doesn't deal with macro nonsense
2
#612 opened 2025-10-08 19:13:03 +02:00 by bjackman
Ignore files marked as linguist-generated=true
Kind
Feature
7
#610 opened 2025-10-07 11:12:38 +02:00 by wetneb
Stack Overflow
Kind
Bug
4
#609 opened 2025-10-07 11:03:04 +02:00 by xmo
bug: merge cannot solve a conflict that solve can
Kind
Bug
#603 opened 2025-09-30 19:24:14 +02:00 by wetneb
Rust: imports with the same signature not recongized as such
#601 opened 2025-09-18 20:22:38 +02:00 by ada4a
Migrate to the threeway_merge crate?
2
#600 opened 2025-09-17 20:58:08 +02:00 by wetneb
New language: Clojure and EDN (LISP)
Kind
New language
1
#595 opened 2025-09-17 07:02:59 +02:00 by devurandom
Allow falling back to zdiff3
Kind
Feature
2
#593 opened 2025-09-16 14:22:34 +02:00 by karlb
Meeting up at FOSDEM 2026
#570 opened 2025-08-17 10:16:09 +02:00 by wetneb
panic: More than 2 conflicting sides
Kind
Bug
#556 opened 2025-08-01 08:49:06 +02:00 by wetneb
Better error types
#552 opened 2025-07-30 12:29:16 +02:00 by wetneb
Syntactically invalid files are attempted to be parsed twice
Kind
Enhancement
13
#551 opened 2025-07-30 12:26:57 +02:00 by wetneb
bug: Insufficient delete/modified conflict detection in commutative merging
Kind
Bad merge
#545 opened 2025-07-28 15:07:25 +02:00 by wetneb
Java: incorrect singature for methods with an integral spread parameter
3
#540 opened 2025-07-26 21:06:35 +02:00 by ada4a
Panic when one of the files to merge contains conflicts in diff2 format
Kind
Bug
1
#520 opened 2025-07-21 21:16:17 +02:00 by wetneb
Mergiraf: You seem to be using Jujutsu instead of Git.
7
#511 opened 2025-07-19 16:10:54 +02:00 by stdedos
Validation of language profiles in tests
Kind
Testing
5
#489 opened 2025-07-10 00:27:29 +02:00 by wetneb
Auto-completion for the CLI
Kind
Feature
#487 opened 2025-07-09 10:52:48 +02:00 by wetneb
Broader test suite for benchmarks
Kind
Testing
10
#485 opened 2025-07-09 10:26:58 +02:00 by wetneb
mergiraf solve fails to resolve any conflicts when file contains multiple conflicts
Kind
Bad merge
1
#482 opened 2025-07-08 13:16:39 +02:00 by V1llent
Display some (temporary?) text when Mergiraf takes a long time to merge a file
Kind
Enhancement
1
#466 opened 2025-07-03 14:17:57 +02:00 by wetneb
Known uses of mergiraf
Kind
Documentation
1
#460 opened 2025-07-02 00:31:30 +02:00 by wetneb
New language: bash
Kind
New language
#451 opened 2025-06-29 18:28:39 +02:00 by wetneb
Documentation: don't force users to use diff3
Kind
Documentation
3
#449 opened 2025-06-29 17:15:47 +02:00 by wetneb