Re: Net-SNMP 5.9.2 published
Bart Van Assche <[email protected]> Tue, 5 Jul 2022 11:23:21 -0700
| Newsgroups | gmane.network.net-snmp.devel |
|---|---|
| Message-ID | <[email protected]> |
On 7/5/22 11:01, Wes Hardaker wrote: > However, the 5.9 branch and the main branch have a *lot* of conflicts to > resolve. The process of always merging patches to main frequently to > avoid this has fallen away, and the branches are now fairly divergent > which is going to be a problem to solve first -- how do we get main in > line with the important changes in the V5-9-patches branch? The number of patches that is on the v5.9 branch but not on the master branch should be small. The only patches for which I encountered merge conflicts recently are the patches that update the change log and the version numbers. Am I perhaps missing something? Thanks, Bart.