mergiraf/mergiraf
mergiraf/mergiraf
9
213
Fork 45
Code Issues 50 Pull requests 6 Releases 19 Activity Actions

feat: Recover from commutative merging failures #568

Merged
wetneb merged 2 commits from commutative_merging_recovery into main 2025-09-03 10:16:16 +02:00
Conversation 0 Commits 2 Files changed 13 +27 -6
wetneb commented 2025-08-16 09:58:40 +02:00
Owner
Copy link

Follow-up to #562 (comment)

This has indeed some impact on the rendering of conflicts - sometimes for the better, sometimes for the worse, but maybe it's still fine.

Follow-up to https://codeberg.org/mergiraf/mergiraf/pulls/562#issuecomment-6154477 This has indeed some impact on the rendering of conflicts - sometimes for the better, sometimes for the worse, but maybe it's still fine.
Adapt tests after propagating errors from commutative merging
All checks were successful
/ test (pull_request) Successful in 45s
Details
f4ec845362
ada4a approved these changes 2025-08-28 00:37:04 +02:00
wetneb merged commit 0d1674ac68 into main 2025-09-03 10:16:16 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
ada4a
Labels
Clear labels   
Compat/Breaking

Breaking change that won't be backward compatible

  
Kind
Bad merge
Examples where the merging algorithm doesn't work as well as it should

  
Kind
Bug
Something is not working

  
Kind
Documentation
Documentation changes

  
Kind
Enhancement
Improve existing functionality

  
Kind
Feature
New functionality

  
Kind
New language

  
Kind
Security
This is security issue

  
Kind
Testing
Issue or pull request related to testing

  
Priority
Critical
The priority is critical

  
Priority
High
The priority is high

  
Priority
Low
The priority is low

  
Priority
Medium
The priority is medium

  
Reviewed
Confirmed
Issue has been confirmed

  
Reviewed
Duplicate
This issue or pull request already exists

  
Reviewed
Invalid
Invalid issue

  
Reviewed
Won't Fix
This issue won't be fixed

  
Status
Abandoned
Somebody has started to work on this but abandoned work

  
Status
Blocked
Something is blocking this issue or pull request

  
Status
Need More Info
Feedback is required to reproduce issue or to continue work

No 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
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: mergiraf/mergiraf#568
No description provided.
Delete branch "commutative_merging_recovery"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?