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

refactor(resolve_merge_cascading): allow parsed_merge to fail independently from resolved_merge, general overhaul #123

Merged
ugur-a merged 12 commits from ada4a/mergiraf:resolve_merge_cascading_overhaul into main 2025-01-06 13:52:39 +01:00
Conversation 8 Commits 12 Files changed 3 +100 -106
ugur-a commented 2025-01-02 19:56:20 +01:00
Contributor
Copy link

The commits should give a pretty step-by-step explanation of the thought process. All in all, I think this brings a lot of structure to the function

The commits should give a pretty step-by-step explanation of the thought process. All in all, I think this brings a lot of structure to the function
ugur-a changed title from resolve_merge_cascading_overhaul to refactor(resolve_merge_cascading): allow parsed_merge to fail independently from resolved_merge, general overhaul 2025-01-02 19:56:36 +01:00
ugur-a commented 2025-01-02 20:03:43 +01:00
Author
Contributor
Copy link

the original motivation: #119 (comment)

the original motivation: https://codeberg.org/mergiraf/mergiraf/pulls/119#issuecomment-2560207
ugur-a force-pushed resolve_merge_cascading_overhaul from d10ee76c1c to 81b1cfa783 2025-01-05 22:18:54 +01:00 Compare
wetneb approved these changes 2025-01-06 13:38:52 +01:00
wetneb commented 2025-01-06 13:39:57 +01:00
Owner
Copy link

Sorry for the time to review this, I had just looked at the overall changes and was a bit overwhelmed. Going through each commit one by one was a lot easier, thanks for doing such a good job at making them meaningful and explained!

Sorry for the time to review this, I had just looked at the overall changes and was a bit overwhelmed. Going through each commit one by one was a lot easier, thanks for doing such a good job at making them meaningful and explained!
ugur-a commented 2025-01-06 13:52:18 +01:00
Author
Contributor
Copy link

Going through each commit one by one was a lot easier, thanks for doing such a good job at making them meaningful and explained!

You're welcome! That's what I always try to do in the PRs -- partially because it makes eventual rebase conflicts much easier to handle, and also to make the life a little easier for the person looking at git blame sometime in the future. Github actually has a handy feature for this: in the "Files changed" tab, you can choose to see the changes of one commit at a time, and "flip through" these -- this is often more convenient than pulling the PR and looking through the commits locally.

> Going through each commit one by one was a lot easier, thanks for doing such a good job at making them meaningful and explained! You're welcome! That's what I always try to do in the PRs -- partially because it makes eventual rebase conflicts much easier to handle, and also to make the life a little easier for the person looking at `git blame` sometime in the future. Github actually has a handy feature for this: in the "Files changed" tab, you can choose to see the changes of one commit at a time, and "flip through" these -- this is often more convenient than pulling the PR and looking through the commits locally.
ugur-a merged commit 0e0d2967d5 into main 2025-01-06 13:52:39 +01:00
ugur-a deleted branch resolve_merge_cascading_overhaul 2025-01-06 13:52:40 +01:00
wetneb commented 2025-01-06 16:55:52 +01:00
Owner
Copy link

Github actually has a handy feature for this: in the "Files changed" tab, you can choose to see the changes of one commit at a time, and "flip through" these -- this is often more convenient than pulling the PR and looking through the commits locally.

Yes I was also looking for this feature here, and it's a bit more hidden but it also exists!

> Github actually has a handy feature for this: in the "Files changed" tab, you can choose to see the changes of one commit at a time, and "flip through" these -- this is often more convenient than pulling the PR and looking through the commits locally. Yes I was also looking for this feature here, and it's a bit more hidden but it also exists!
ugur-a commented 2025-01-06 17:08:59 +01:00
Author
Contributor
Copy link

Really? 👀 Do tell me more!

Really? 👀 Do tell me more!
wetneb commented 2025-01-06 17:12:39 +01:00
Owner
Copy link

It's this button: image in the files tab.

It's this button: ![image](/attachments/6af8cf33-62f5-4497-8e12-b58c943b9218) in the files tab.
image.png
729 B
ugur-a commented 2025-01-06 17:23:14 +01:00
Author
Contributor
Copy link

This should definitely be more prominent (i.e have text instead of just a pictogram)! And I wish one could navigate commits with arrows. Maybe the developers want to first polish the feature before showing it off.
But anyway, thanks for the tip!

This should definitely be more prominent (i.e have text instead of just a pictogram)! And I wish one could navigate commits with arrows. Maybe the developers want to first polish the feature before showing it off. But anyway, thanks for the tip!
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#123
No description provided.
Delete branch "ada4a/mergiraf:resolve_merge_cascading_overhaul"

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?