[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [lwip-users] About the problem of merging master branch with STABLE-
|
From: |
Indan Zupancic |
|
Subject: |
Re: [lwip-users] About the problem of merging master branch with STABLE-2_1_x. |
|
Date: |
Thu, 03 Nov 2022 15:17:21 +0100 |
|
User-agent: |
Roundcube Webmail/1.3.16 |
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