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

[刘跃 Jeff Liu]

Hi Indan,

Thank you for your reply. I have another question. During the same period of 
time, there were many bug fixes in the master branch, why some bug fixes were 
not merged into the release branch, but some fixes commits were merged into it. 
What is the basis for doing this, for example: "2018-11-13 Fix bug #55017: 
Wrong return value in sys_arch_mbox_tryfetch() in FreeRTOS port", this commit 
only exists in the master branch, but not in the release branch.
And I found that since STABLE-2_1_0_RELEASE, the two branches of STABLE-2_1_x 
and master are very different. After this STABLE-2_1_0_RELEASE, the 
STABLE-2_1_x branch only merges some commits(bug fix) of master, I want to know 
What are the rules and reasons for this?

Jeff
BR


////////////////////////////////////////////////////////////////////////////////////////////////////////////
Hello Jeff,

On 2022-11-03 12:08, 刘跃 Jeff Liu wrote:
> I want to know the git development and merging strategy of lwip.

Releases are made when one of the maintainers have time, but they didn't get to 
it for a while.

> 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?

Just use master, as you noticed it's in better shape than the release.

Greetings,

Indan