On 03.05.22 14:54, Eric Barboni wrote:
Well
I have caused the mess 😃.
don't worry
I try one option to redo a PR based 4007 with the patch
https://github.com/apache/netbeans/pull/4007.patch
Would it be fine ?
I think so.
But would it be easier to:
1) clone the nb repo, checkout delivery
2) pull from a "lost" PR branch into local delivery, this will
automatically merge
3.1) push to your remote delivery just to check the delta again
3.2) push to the main netbeans delivery if everything is OK
or:
I (or anybody else) could also simply create another PR, from the
original PR branch and we could just review + press merge again?
whatever you prefer - don't know what the others think.
best regards,
michael
Eric
-----Message d'origine-----
De : Neil C Smith <>
Envoyé : lundi 2 mai 2022 18:45
À : [email protected]
Objet : Re: [RELEASES] Issue on delivery merge
On Mon, 2 May 2022 at 17:11, Matthias Bläsing <[email protected]> wrote:
ebarboni force-pushed the delivery branch from 74e1e5f to 217f7df 4
days ago (2022-04-28 13:58 CEST)
..
- get a list of all closed PRs on github with a change date in the
last 4-5 days
Also, a reversed way which correlates is to use
https://github.com/apache/netbeans/commit/74e1e5f91c48df7a06154781bcf17da397a589a8
and follow the parent links - only those two PRs have a warning that the commit
isn't in delivery.
Neil
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
