Address
:
[go:
up one dir
,
main page
]
Include Form
Remove Scripts
Accept Cookies
Show Images
Show Referer
Rotate13
Base64
Strip Meta
Strip Title
Session Cookies
This website requires JavaScript.
Explore
About
FAQ
Help
Donate
Register
Sign in
mergiraf
/
mergiraf
Watch
9
Star
213
Fork
You've already forked mergiraf
45
Code
Issues
51
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
7 Open
10 Closed
17 All
Label
Show archived labels
Use
Alt
+
Click
to exclude labels
All labels
No label
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
All milestones
No milestones
Project
All projects
No project
Author
All authors
Assignee
All assignees
No assignee
ada4a
bobvanderlinden
funkeleinhorn
mathstuf
senekor
wetneb
zivarah
Sort
Relevance
Newest
Oldest
Recently updated
Least recently updated
Most commented
Least commented
Nearest due date
Farthest due date
7 Open
10 Closed
17 All
Close
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
Support the
conflict-marker-size
git attribute
Kind
Enhancement
2
#617
opened
2025-10-12 11:39:44 +02:00
by
wetneb
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
Syntactically invalid files are attempted to be parsed twice
Kind
Enhancement
13
#551
opened
2025-07-30 12:26:57 +02:00
by
wetneb
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
Switch to the "GumTree Simple" matching algorithm
Kind
Enhancement
7
#406
opened
2025-05-22 15:18:55 +02:00
by
wetneb
How to review
mergiraf solve
result?
Kind
Enhancement
3
#66
opened
2024-12-01 09:24:57 +01:00
by
piegames
Partially solved conflicts are confusing
Kind
Enhancement
2
#41
opened
2024-11-19 17:37:38 +01:00
by
wilfred