CURRENT, usr/src on git, howto "mergemaster"?

[Marek Zarychta]

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

-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 495 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/freebsd-current/attachments/20210104/62f6b423/attachment.sig>