Fossil SCM
"fossil patch pull" does not resolve merge conflicts.
92d82657382eb3b…
· opened 3 years, 11 months ago
- Type
- Code_Defect
- Priority
- Immediate
- Severity
- Important
- Resolution
- Unable_To_Reproduce
- Subsystem
- —
- Created
- April 18, 2022 2:41 p.m.
I observed the following behavior:
-
Machine 1: Run "
fossil merge ..." such that the merge generates conflicts. -
Machine 1: Fix the merge conflicts.
-
Machine 2: Run "
fossil patch pull ..." from machine 1. The merge conflicts are unresolved.
It is as if the "fossil patch" command overlooked and did not transfer the edits to the file that contained the merge conflict.
Comments (2)
I observed the following behavior:
-
Machine 1: Run "
fossil merge ..." such that the merge generates conflicts. -
Machine 1: Fix the merge conflicts.
-
Machine 2: Run "
fossil patch pull ..." from machine 1. The merge conflicts are unresolved.
It is as if the "fossil patch" command overlooked and did not transfer the edits to the file that contained the merge conflict.
Unable to reproduce the problem. Reopen with a specific example if one is found.