freebsd-rustdate resolve-merges

Where freebsd-update has all this merge conflict resolution done interactively as part of the upgrade command, freebsd-rustdate has split it out to a separate command. If upgrade winds up with conflicts, it’ll tell you to run this command. show-install and show-merges will also tell you if there are any, and install won’t proceed until you fix them.

Like freebsd-update, a 3-way merge is attempted, then this command will drop your in your $EDITOR to fix the conflicts. Various commands along the way will let you accept, redo, or skip out to come back later.

In principle, enough information is stored that alternate resolution strategies could be added.

See Also

You’d get conflicted merges during an upgrade.

You can review the completed merges with show-merges.

These merged files will get installed when you run install. You may also want to look at show-install for more info about what all will be installed.