W dniu 04.01.2021 o 17:14, Warner Losh pisze: > etcupdate does a full three merge, while mergemaster fakes it in a number > of ways. etcupdate directly keeps track of the resolutions, which is why > $FreeBSD$ doesn't matter so much to it. > > mergemaster is deprecated and will likely be removed from the system > because it has no maintainer and is quite a bit harder to keep working than > etcupdate. >
Please don't sacrifice mergemaster(8) for the successful transition to Git. The amount of feedback on the mailing list should give the core@ some idea of how widely mergemasted is still deployed. Some people just like to merge files side by side with pressing keys. Why innocent mergemaster(8) has to be a victim of switching to Git? Sacrifice please svnlite(1) - it became completely useless for HEAD and upcoming stable branches. Kind regards, -- Marek Zarychta
OpenPGP_signature
Description: OpenPGP digital signature
