Spurious conflicts with identical sides #356

Closed
opened 2025-04-27 09:43:53 +02:00 by wetneb · 0 comments
Owner

While rebasing a branch in mergiraf itself, I got a conflict with identical sides:

<<<<<<< HEAD
) -> (ParsedMerge<'static>, MergeResult) {
||||||| parent of e81a230 (refactor: move syntax checking from line_based.rs to merge_result.rs)
) -> MergeResult {
=======
) -> MergeResult {
>>>>>>> e81a230 (refactor: move syntax checking from line_based.rs to merge_result.rs)

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).

While rebasing a branch in mergiraf itself, I got a conflict with identical sides: ``` <<<<<<< HEAD ) -> (ParsedMerge<'static>, MergeResult) { ||||||| parent of e81a230 (refactor: move syntax checking from line_based.rs to merge_result.rs) ) -> MergeResult { ======= ) -> MergeResult { >>>>>>> e81a230 (refactor: move syntax checking from line_based.rs to merge_result.rs) ``` 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).
wetneb self-assigned this 2025-05-09 18:18:10 +02:00
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
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#356
No description provided.