Auto-mergiraf was attempted multiple times and disabled every time as it can corrupt files in a way which may or may not be caught during testing (e.g. https://discord.com/channels/678381219515465750/704997651833159831/1441364779955388419). It should probably be removed.
However an explicit request to autoresolve (either via mergiraf solve, or via re-doing the forward-port with mergiraf set as merge driver) could be nice, under the assumption that the results are still the responsibility of the user / employee, and so corruptions / false positives would be less problematic. This should be implemented alongside a guide to configure merge drivers locally (with validation that they work alongside git-fw).
Furthermore this could be expanded to arbitrary merge drivers in case someone wants to use weave or is insane enough for rizzler.
Auto-mergiraf was attempted multiple times and disabled every time as it can corrupt files in a way which may or may not be caught during testing (e.g. https://discord.com/channels/678381219515465750/704997651833159831/1441364779955388419). It should probably be removed.
However an explicit request to autoresolve (either via
mergiraf solve, or via re-doing the forward-port withmergirafset as merge driver) could be nice, under the assumption that the results are still the responsibility of the user / employee, and so corruptions / false positives would be less problematic. This should be implemented alongside a guide to configure merge drivers locally (with validation that they work alongside git-fw).Furthermore this could be expanded to arbitrary merge drivers in case someone wants to use weave or is insane enough for rizzler.