[gnutls-devel] GnuTLS | Checked-in files in devel/ contain local paths that result in merge conflicts (#797)

[Read-only notification of GnuTLS library development activities]

Daiki Ueno commented:


I'm afraid this alone wouldn't improve the situation, because the XML file format is not stable over ABI changes (see https://gitlab.com/gnutls/gnutls/-/issues/954#note_305759879). For the time being I'd suggest using an external diff/merge driver for that.

-- 
Reply to this email directly or view it on GitLab: https://gitlab.com/gnutls/gnutls/-/issues/797#note_509487468
You're receiving this email because of your account on gitlab.com.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.gnupg.org/pipermail/gnutls-devel/attachments/20210215/0a1de0ba/attachment.html>