Spurious conflicts with identical sides #356
Labels
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
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference: mergiraf/mergiraf#356
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "%!s()"
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?
While rebasing a branch in mergiraf itself, I got a conflict with identical sides:
Running
mergiraf solve
also doesn't resolve the conflict.I'd like to investigate why it doesn't get resolved automatically in favour of the
HEAD
version. It might be a duplicate of an existing issue though.This happened with the current
main
version of mergiraf (commit b95da604328bf2cecf619f2bea6f62401c5749f).