mergiraf/mergiraf
mergiraf/mergiraf
9
213
Fork 45
Code Issues 51 Pull requests 7 Releases 19 Activity Actions

fix(TreeBuilder): resolve not-really-conflicts (left and right agree), take 2 #204

Merged
ada4a merged 4 commits from ada4a/mergiraf:170-not_really_a_conflict-v2 into main 2025-02-15 11:24:58 +01:00
Conversation 2 Commits 4 Files changed 2 +100 -24
ada4a commented 2025-02-12 17:33:06 +01:00
Owner
Copy link

supersedes #188

fixes #170

supersedes #188 fixes #170
similar to the "1 successor" branch
ada4a reviewed 2025-02-12 18:04:20 +01:00
src/tree_builder.rs
@ -258,0 +239,4 @@
return line_based;
};
let MergedTree::Conflict {
ada4a commented 2025-02-12 18:04:19 +01:00
Author
Owner
Copy link

Since we're destructuring conflict here anyway, we could just pass the sides to resolve_commutative_conflict directly. And since destructing conflict is all the latter does besides calling commutatively_merge_list, I think we could just remove resolve_commutative_conflict and call commutatively_merge_list directly

Since we're destructuring `conflict` here anyway, we could just pass the sides to `resolve_commutative_conflict` directly. And since destructing `conflict` is all the latter does besides calling `commutatively_merge_list`, I think we could just remove `resolve_commutative_conflict` and call `commutatively_merge_list` directly
wetneb commented 2025-02-15 11:14:07 +01:00
Owner
Copy link

It sounds good to me, intuitively

It sounds good to me, intuitively
ada4a commented 2025-02-15 11:21:54 +01:00
Author
Owner
Copy link

Great, I'll open a PR for that then

Great, I'll open a PR for that then
comment
All checks were successful
/ test (pull_request) Successful in 47s
Details
1b1ce78565
wetneb approved these changes 2025-02-15 11:14:23 +01:00
ada4a merged commit b147bdafce into main 2025-02-15 11:24:58 +01:00
ada4a deleted branch 170-not_really_a_conflict-v2 2025-02-15 11:24:59 +01:00
Sign in to join this conversation.
Reviewers
No reviewers
wetneb
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#204
No description provided.
Delete branch "ada4a/mergiraf:170-not_really_a_conflict-v2"

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?