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

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Re: [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
GitLab

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 #954 (comment 305759879)). For the time being I'd suggest using an external diff/merge driver for that.


_______________________________________________
Gnutls-devel mailing list
[hidden email]
http://lists.gnupg.org/mailman/listinfo/gnutls-devel