fix: The solve command preserves revision names in conflicts #74

Merged

wetneb merged 7 commits from wetneb/mergiraf:solve_keeps_revision_names into main

2024-12-06 19:49:33 +01:00

Author	SHA1	Message	Date
Antonin Delpeuch	aa5b303983	Merge branch 'main' into solve_keeps_revision_names All checks were successful / rustfmt (pull_request) Successful in 23s Details / test (pull_request) Successful in 48s Details	2024-12-06 19:41:39 +01:00
Ughur Alakbarov	49e3fae8a7	refactor(add_revision_names): move under `DisplaySettings` All checks were successful / rustfmt (pull_request) Successful in 23s Details / test (pull_request) Successful in 45s Details it's modifying the settings with the help of a `ParsedMerge` after all	2024-12-04 18:40:43 +01:00
Ughur Alakbarov	39f56ba4a8	style: match with one arm -> if-let	2024-12-04 18:40:43 +01:00
Ughur Alakbarov	673047111f	refactor(add_revision_names): take `&mut settings` and modify it no more need to return a new clone	2024-12-04 18:40:43 +01:00
Ughur Alakbarov	2e6bd96ba8	pass `settings` by value to `resolve_merge_cascading`	2024-12-04 18:40:43 +01:00
Ughur Alakbarov	5e37ca9b8a	style: needless_into	2024-12-04 18:40:43 +01:00
Antonin Delpeuch	6ae73906ab	fix: The solve command preserves revision names in conflicts All checks were successful / rustfmt (pull_request) Successful in 21s Details / test (pull_request) Successful in 39s Details For #37.	2024-12-03 23:09:22 +01:00