[lwip-users] About the problem of merging master branch with STABLE-2_1_x.

[刘跃 Jeff Liu]

Hi All;

I want to know the git development and merging strategy of lwip. I learned from git that lwip currently has several branches, one is the master branch and the other is the STABLE-2_1_x branch, and then I selected the STABLE-2_1_3 tag to compare with the master,  I found an interesting thing in the submission of the branch. The bug or added function of the master branch will be merged into the release branch very late. I want to know the difference between the master branch and the STABLE-2_1_x branch, and how to manage it.

For example: this commit of master branch "Fix bug #54805: IP address can not be obtained over dhcp if PBUF_POOL_BUFSIZE is too small", 2018-10-19 has been submitted, but in STABLE-2_1_x until 2021-10-03 was merged, and why did many changes in the master branch not enter the STABLE-2_1_x branch in time?

I am currently developing based on the STABLE-2_1_3_RELEASE branch, and then I want to update some bug fixes from the master branch, so I found the above problem, what should I do?

Or can I only develop based on STABLE-2_1_3_RELEASE and master branch cannot be merged with STABLE-2_1_x?

 

Thanks.

Jeff